Index: applications/editors/josm/i18n/po/ar.po
===================================================================
--- applications/editors/josm/i18n/po/ar.po	(revision 19689)
+++ applications/editors/josm/i18n/po/ar.po	(revision 19698)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-19 00:01-0500\n"
-"PO-Revision-Date: 2010-01-14 14:29-0500\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-23 21:57+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\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-01-13 18:25+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -71,11 +71,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -236,5 +236,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -248,13 +248,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -263,5 +263,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -287,5 +290,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "إدمج"
@@ -314,5 +317,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -379,9 +382,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -389,5 +392,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "مُوافق"
@@ -438,6 +443,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -455,5 +460,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -462,11 +467,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -503,5 +508,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "التناقض"
@@ -632,14 +637,14 @@
 msgstr "الرجاء إختر على الأقل طريقتين للدمج."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "نسخ"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "نسخ الكائنات  المختارة الى وسيط الصق"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "الرجاء إختيار شيء للنسخ."
@@ -670,8 +675,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -680,5 +685,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -735,24 +740,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "حصل {0} تضارب خلال الإسيراد"
-msgstr[1] "حصل {0} تضارب خلال الإسيراد"
-msgstr[2] "حصل {0} تضارب خلال الإسيراد"
-msgstr[3] "حصل {0} تضارب خلال الإسيراد"
-msgstr[4] "حصل {0} تضارب خلال الإسيراد"
-msgstr[5] "حصل {0} تضارب خلال الإسيراد"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "تضاربات حين التنزيل"
-msgstr[1] "تضاربات حين التنزيل"
-msgstr[2] "تضاربات حين التنزيل"
-msgstr[3] "تضاربات حين التنزيل"
-msgstr[4] "تضاربات حين التنزيل"
-msgstr[5] "تضاربات حين التنزيل"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -773,4 +769,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -779,4 +777,32 @@
 #: ../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
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "نسخة مطابقة"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+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:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "الطبقة: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, 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 ""
 
@@ -868,14 +894,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 msgid "The selected way has nodes outside of the downloaded data region."
 msgid_plural ""
 "The selected ways have nodes outside of the downloaded data region."
-msgstr[0] "إنّ العقد المختارة لا تتقاسم نفس الطريق."
-msgstr[1] "إنّ العقد المختارة لا تتقاسم نفس الطريق."
-msgstr[2] "إنّ العقد المختارة لا تتقاسم نفس الطريق."
-msgstr[3] "إنّ العقد المختارة لا تتقاسم نفس الطريق."
-msgstr[4] "إنّ العقد المختارة لا تتقاسم نفس الطريق."
-msgstr[5] "إنّ العقد المختارة لا تتقاسم نفس الطريق."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -994,5 +1015,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr ""
@@ -1142,5 +1163,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr ""
 
@@ -1154,13 +1175,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "جاري فتح الملفات"
-msgstr[1] "جاري فتح الملفات"
-msgstr[2] "جاري فتح الملفات"
-msgstr[3] "جاري فتح الملفات"
-msgstr[4] "جاري فتح الملفات"
-msgstr[5] "جاري فتح الملفات"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1216,7 +1233,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1230,5 +1247,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "حرّك العقد حيث تكون الزوايا 90 أو 270 درجة"
 
@@ -1262,4 +1280,8 @@
 "undesirable results when doing rectangular alignments.<br>Change your "
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+msgid "Selection must consist only of ways and nodes."
 msgstr ""
 
@@ -1275,4 +1297,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204
 msgid "Selected Elements cannot be orthogonalized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
 msgstr ""
 
@@ -1379,18 +1411,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1415,12 +1447,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "خطأ"
@@ -1550,5 +1583,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1746,8 +1779,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1791,5 +1820,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr ""
@@ -2203,6 +2232,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2317,5 +2346,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "بحث عن أغراض."
@@ -2360,12 +2389,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
-#, fuzzy
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
-msgstr "<b>\"شارع الفران\"</b> - 'شارع الفران' في أي مفتاح أو إسم."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
-#, fuzzy
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
-msgstr "<b>\"شارع الفران\"</b> - 'شارع الفران' في أي مفتاح أو إسم."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
@@ -2499,5 +2526,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "إبحث"
@@ -2537,12 +2564,11 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "ج."
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
@@ -2550,10 +2576,10 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2563,9 +2589,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2698,13 +2724,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "غيّر غرض {0}"
-msgstr[1] "غيّر {0} غرضين"
-msgstr[2] "غيّر {0} أغراض"
-msgstr[3] "غيّر {0} غرض"
-msgstr[4] "غيّر {0} أغراض"
-msgstr[5] "غيّر {0} غرض"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2754,12 +2776,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "أحذف \"{0}\"  لِــ {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "عيّن  {0}={1} لِــ {2} {3}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2817,17 +2839,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "نمط المحو"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "طبقة المعطيات {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "أمحي من العلاقة"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2905,13 +2927,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "غيّر غرض {0}"
-msgstr[1] "غيّر {0} غرضين"
-msgstr[2] "غيّر {0} أغراض"
-msgstr[3] "غيّر {0} غرض"
-msgstr[4] "غيّر {0} أغراض"
-msgstr[5] "غيّر {0} غرض"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -2964,8 +2982,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
@@ -2980,7 +2994,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "هل حقاً أمحي الخيار من العلاقة {0} ؟"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3225,5 +3239,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3231,5 +3245,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3237,5 +3251,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3243,5 +3257,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3314,15 +3328,13 @@
 #. column header: filter text
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
-#, fuzzy
 msgctxt "filter"
 msgid "Text"
-msgstr "النص"
+msgstr ""
 
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "مراحيض"
+msgstr ""
 
 #. column header: inverted filter
@@ -3363,19 +3375,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3384,5 +3396,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3390,5 +3402,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3511,6 +3523,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3524,5 +3536,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3537,7 +3549,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3563,5 +3575,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "الخلفية"
@@ -3705,6 +3717,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3712,37 +3724,38 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "غير كامل"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "من النوع طريق"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "خط سكة حديد"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "مجرى مياه"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "إستعمال الأرض"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3755,10 +3768,10 @@
 msgstr[5] "{0} عقد"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3767,5 +3780,5 @@
 msgstr[1] "{0} أعضاء"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3802,6 +3815,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "التناقض"
@@ -3812,5 +3825,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-msgid "Authorization Failed"
+msgid "Authorisation Failed"
 msgstr ""
 
@@ -4007,5 +4020,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "جاري التهيئة"
@@ -4046,5 +4058,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4055,5 +4067,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "حرّر"
@@ -4124,29 +4136,29 @@
 msgstr "المقياس"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "خطّ الطول عند مؤشر الفأرة."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The name of the object at the mouse pointer."
 msgstr "إسم الغرض عند مؤشر الفأرة."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "خطّ العرض عند مؤشر الفأرة."
 
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+msgid "The angle between the previous and the current way segment."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
-msgid "The 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:105
-msgid "The (compass) heading of the line segment being drawn."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
 msgid "The length of the new way segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4154,9 +4166,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(لا يوجد أي غرض)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4316,13 +4328,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "صلّح تضاربات التسمية"
-msgstr[1] "صلّح تضاربات التسمية"
-msgstr[2] "صلّح تضاربات التسمية"
-msgstr[3] "صلّح تضاربات التسمية"
-msgstr[4] "صلّح تضاربات التسمية"
-msgstr[5] "صلّح تضاربات التسمية"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
@@ -4332,8 +4340,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
@@ -4388,16 +4392,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4593,8 +4597,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr "ادمج العقد إلى العقدة الأعتق."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4629,8 +4637,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
@@ -4648,8 +4652,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
@@ -4750,5 +4750,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr ""
@@ -4794,5 +4794,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -4922,10 +4927,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "الكلّ"
@@ -5005,7 +5010,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -5019,6 +5024,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5198,10 +5203,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5221,18 +5226,18 @@
 msgstr "تكدس الأوامر: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "حلّ"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5265,5 +5270,5 @@
 "<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.Click <strong>{0}</strong> to close anyway."
+"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.</"
@@ -5289,5 +5294,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5296,5 +5301,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5374,43 +5379,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "الطبقات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 msgid "Open a list of all loaded layers."
 msgstr "إفتح لائحة بكلّ التبقات المحملة."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "عرض/إخفاء"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "نسخة مطابقة"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 msgid "Move the selected layer one row up."
 msgstr "أنقل الطبقة المختارة صفّ إلى الأعلى."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "أنقل الطبقة المختارة صفّ إلى الأسفل."
@@ -5424,6 +5434,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "العلاقات"
@@ -5433,69 +5443,69 @@
 msgstr "إفتح لائحة بكل العلاقات."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "العلاقات: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "إفتح محرر نص للعلاقة المحددة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "أمحي العلاقة المحددة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "أنشئ علاقة جديدة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "الخيار الحالي"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "إفتح نافذة لائحة خيارات."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "الخيار: علاقات:{0} / طرقات:{1} / عقد:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5503,5 +5513,5 @@
 msgstr "الخيار"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5765,8 +5775,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331
@@ -5856,8 +5862,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -5929,4 +5933,7 @@
 #. <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 />
@@ -6005,6 +6012,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6046,6 +6054,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6514,152 +6524,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "الإسم"
@@ -7042,5 +7054,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<مختلف>"
@@ -7095,55 +7107,55 @@
 msgstr "أضف صفة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "الخصائص: {0} / العضويات: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "الخصائص/ العضويات"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "غيّر العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "أمحي من العلاقة"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "هل حقاً أمحي الخيار من العلاقة {0} ؟"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "أمحي المفتاح المنتقى من كلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "أمحي الخصائص"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "أضف زوج جديد مفتاح/قيمة إلى كلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "حرّر المحتاح المنقى لكلّ الأغراض"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7183,8 +7195,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:345
@@ -7468,8 +7476,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
@@ -7478,7 +7482,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
-#, fuzzy
 msgid "Do you really want to apply the new role?"
-msgstr "هل تريد السماح بذلك ؟"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
@@ -7594,47 +7597,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "إشارات مرجعية"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../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:187
+#: ../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:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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:212
+#: ../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:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr ""
@@ -7755,18 +7757,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -7777,34 +7779,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../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:111
+#: ../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:147
+#: ../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:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr ""
@@ -7815,7 +7817,9 @@
 #. 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" />
@@ -7824,10 +7828,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "النوع"
@@ -7836,5 +7841,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -7846,17 +7851,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "مجهول"
@@ -8201,5 +8205,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr ""
@@ -8564,8 +8568,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
@@ -8624,8 +8624,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500
@@ -8648,9 +8644,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8660,7 +8656,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -8672,16 +8668,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr ""
@@ -9094,68 +9090,68 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "نقطة gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Use global settings."
 msgstr "إستعمل الإعدادات العامة."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "خصّص اللون"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "الغيابي"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "إختر لون"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "إستورد صوت مسجل"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9165,23 +9161,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "ملفات صوتيت (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "العلامات الصوتية من {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "إستورد صور"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9191,5 +9187,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9197,5 +9193,5 @@
 msgstr "الإسم: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9203,5 +9199,5 @@
 msgstr "الوصف: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9211,23 +9207,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "الطول: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9236,5 +9232,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9243,10 +9239,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9256,43 +9252,43 @@
 "مضرة.<br>أنظر هنا إذا أردت تحميل بعض الأثرات:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "محوّل من: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "نزّل من أو.أس.أم على طول هذا المسلك"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "نزّل كلّ شيئ بين:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} أمتار"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "المساحة القصوى للمطلب:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} كلم²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9301,9 +9297,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9311,5 +9307,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9317,23 +9313,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "طبقة المعطيات {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "خارج عن المنطقة المنزلة"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9342,5 +9338,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9354,5 +9350,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9365,11 +9361,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9378,32 +9374,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} يتألف من:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9458,28 +9454,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "نقاط جهاز تحديد المواقع العالمي"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "خطء عند تحليل {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "لم أتمكن من قراءة \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9488,34 +9483,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9523,64 +9518,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9589,50 +9584,46 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9641,5 +9632,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9647,22 +9638,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 msgid "The selected photos do not contain time information."
-msgstr "إنّ العقد المختارة لا تتقاسم نفس الطريق."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -9670,17 +9660,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9689,5 +9679,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9696,67 +9686,63 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "جاري قراءة {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "لم يتم تحميل أي معطيات."
-msgstr[1] "لم يتم تحميل أي معطيات."
-msgstr[2] "لم يتم تحميل أي معطيات."
-msgstr[3] "لم يتم تحميل أي معطيات."
-msgstr[4] "لم يتم تحميل أي معطيات."
-msgstr[5] "لم يتم تحميل أي معطيات."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -9764,15 +9750,11 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -9781,5 +9763,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -9872,5 +9854,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -9882,5 +9864,5 @@
 msgstr[5] "دالات"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -9889,29 +9871,29 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "مزامنة الصوت"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 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:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../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:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -9919,17 +9901,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "أعرض/أخفي النص/الأيقونات"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
+#: ../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 "
@@ -9937,5 +9919,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -9943,5 +9925,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "غير قادر على إنشاء دالة صوتيت جديدة."
@@ -9967,5 +9949,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
 #, java-format
 msgid ""
@@ -9973,5 +9955,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
 #, java-format
 msgid ""
@@ -10023,7 +10005,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
 msgid "Authorize URL:"
-msgstr "المؤلف"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10113,7 +10094,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
 msgid "Authorize now"
-msgstr "المؤلف"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10251,7 +10231,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
 msgid "Please select an authorization procedure: "
-msgstr "الرجاء إختيار أربعة عقد على الأقل."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10261,7 +10240,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
-#, fuzzy
 msgid "Close the dialog and cancel authorization"
-msgstr "أغلق الحوار و الغي التنزيل"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
@@ -10574,5 +10552,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr ""
@@ -10586,5 +10564,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10721,9 +10699,4 @@
 msgstr "نوع   الطلاء   {0}:{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "الطبقة: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -10753,6 +10726,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr ""
@@ -10791,8 +10764,8 @@
 msgstr ""
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "السيارة"
@@ -10814,13 +10787,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "الدراجة"
@@ -10853,12 +10826,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "المشي"
@@ -11814,5 +11787,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -11820,18 +11800,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "ميزات خيارية:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr "طريق مغلقة الدوران"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "نوع غير معروف: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -11842,16 +11822,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "خطأ في التحليل النحوي  {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "العناصر من الفصيلة {0} هي مدعومة"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -11864,18 +11844,17 @@
 msgstr[5] "غيّر {0} غرض"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "الخيار فارغ !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "الخيار غير مناسب !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "طبّق الخيار المسبق"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "غيّر الخصائص"
@@ -12149,6 +12128,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12173,9 +12152,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12191,7 +12170,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
-#, fuzzy
 msgid "Looking for image files"
-msgstr "جاري البحث عن خط الشاطئ"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
@@ -12199,7 +12177,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
@@ -12271,5 +12255,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "الإحداثيات المستوردة: "
@@ -12370,13 +12354,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "غيّر غرض {0}"
-msgstr[1] "غيّر {0} غرضين"
-msgstr[2] "غيّر {0} أغراض"
-msgstr[3] "غيّر {0} غرض"
-msgstr[4] "غيّر {0} أغراض"
-msgstr[5] "غيّر {0} غرض"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -12907,8 +12887,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
@@ -13014,8 +12990,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13088,8 +13060,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
-msgstr[5] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:567
@@ -13375,6 +13343,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -13490,6 +13458,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13498,5 +13466,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -13641,4 +13609,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr ""
@@ -13729,5 +13698,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "إستيفاء العنوان"
@@ -14306,5 +14275,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr ""
@@ -14461,21 +14430,21 @@
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr ""
@@ -14507,9 +14476,9 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -14524,13 +14493,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr ""
@@ -14539,6 +14508,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr ""
@@ -14764,17 +14733,17 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../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:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -14818,42 +14787,41 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr ""
@@ -14909,6 +14877,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -14917,73 +14885,73 @@
 msgstr "الماء"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../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:43
+#: ../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:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../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:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../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:55
+#: ../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:57
+#: ../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:59
+#: ../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:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr "حجم الخابية الأقصى (م. بايت)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../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:67
+#: ../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:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14991,5 +14959,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -14997,5 +14965,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -15003,58 +14971,58 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../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:79
+#: ../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:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "الحجم الأقصى لكل مجلد خابية بلــبايت. الحجم الغيابي هو 300 م. بايت"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../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:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../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:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr ""
@@ -15078,5 +15046,5 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr ""
@@ -15107,5 +15075,5 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr ""
@@ -15179,5 +15147,5 @@
 msgstr "الزاوية بين عقدتين محددتين"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr ""
@@ -15434,4 +15402,71 @@
 #: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:135
 msgid "Firefox executable"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#, fuzzy
+msgid "Read error!"
+msgstr "خزان"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "أدخل الأحداثيات للعقدة الجديدة."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+msgid "keep backup files"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "خطأ"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+msgid "File could not be deleted!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "لم أتمكن من إعادة تسمية الوثيقة ''{0}''"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+msgid "Override old backup files?"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+msgid "Keep old backups and continue"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "الكتابة فوقه"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+msgid "Could not delete temporary file!"
 msgstr ""
 
@@ -15705,6 +15740,6 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -15826,72 +15861,128 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+msgid "Terrace a house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+#, fuzzy
+msgid "Interpolation"
+msgstr "إستيفاء العنوان"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "شارع"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "أرقام البلاطة"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "رقم النقطة"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+msgid "Lowest housenumber of the terraced house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "أنشئ علاقة جديدة"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "امحي عقد أو طرقات."
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "إسم الشارع"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../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:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr ""
@@ -16124,5 +16215,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr ""
@@ -16132,5 +16223,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16139,9 +16230,9 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr ""
@@ -16176,5 +16267,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr "متعدد الضلوع"
@@ -16319,7 +16410,7 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -16327,80 +16418,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16408,86 +16499,86 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -16927,5 +17018,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -16936,63 +17027,63 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+msgid "Download visible tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
-msgid "Download visible tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -17243,6 +17334,13 @@
 msgstr ""
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17251,15 +17349,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr "إسمح لتطبيقات أخرى بإرسال أوامر إلى د.أو.أس.أم."
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17268,10 +17366,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17280,15 +17378,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17298,10 +17396,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17310,5 +17408,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17317,10 +17415,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -17427,6 +17525,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -17434,6 +17541,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr ""
@@ -17450,5 +17558,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr ""
@@ -17470,10 +17578,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -17517,14 +17625,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr ""
@@ -17567,13 +17675,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -17611,13 +17719,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr ""
@@ -17652,13 +17760,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr ""
@@ -17693,13 +17801,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr ""
@@ -17830,4 +17938,13 @@
 #: build/trans_presets.java:225
 msgid "Edit Unclassified Road"
+msgstr ""
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
 msgstr ""
 
@@ -17846,15 +17963,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr ""
@@ -17866,5 +17983,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr ""
@@ -17873,5 +17990,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr ""
@@ -17889,16 +18006,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr ""
@@ -17920,166 +18040,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "غابة/حرش"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr ""
@@ -18087,5 +18214,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr ""
@@ -18094,5 +18221,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr ""
@@ -18100,5 +18227,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "المشاة"
@@ -18107,5 +18234,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "حرّر شارع للمشاة"
@@ -18113,5 +18240,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr ""
@@ -18120,5 +18247,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr ""
@@ -18128,18 +18255,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr ""
@@ -18147,5 +18274,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr ""
@@ -18155,5 +18282,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -18161,5 +18288,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -18168,5 +18295,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -18175,20 +18302,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -18196,9 +18323,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 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"
@@ -18209,6 +18337,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18220,4 +18346,5 @@
 #. 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"
@@ -18236,141 +18363,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr ""
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr ""
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr ""
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr ""
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr ""
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr ""
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -18385,10 +18520,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr ""
@@ -18404,10 +18539,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "الدراجة النارية"
@@ -18422,27 +18557,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr ""
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr ""
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr ""
@@ -18450,25 +18577,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr "الإرتفاع الأقصى (أمتار)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr ""
@@ -18479,5 +18606,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr ""
@@ -18497,10 +18624,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr ""
@@ -18522,10 +18649,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr ""
@@ -18547,10 +18674,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr ""
@@ -18572,5 +18699,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -18585,9 +18712,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr ""
@@ -18601,9 +18728,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr "شارع سكني"
@@ -18633,10 +18760,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr ""
@@ -18666,5 +18793,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -18676,10 +18803,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "حرّر جسر"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr "حرّر خندق"
@@ -18687,19 +18814,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr ""
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr ""
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr ""
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr ""
@@ -18715,5 +18842,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr ""
@@ -18721,5 +18848,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr ""
@@ -18728,40 +18855,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "النوع"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "الطريق"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "الطريق"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "الطريق"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "الطريق"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "الطريق"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr ""
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -18769,5 +18890,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -18775,27 +18896,26 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "نافورة"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
 msgstr ""
@@ -18803,5 +18923,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr ""
@@ -18810,12 +18930,32 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr ""
 
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
+
 #: build/trans_presets.java:489
-#, fuzzy
 msgid "Wheelchairs"
-msgstr "مناسب لكرسي المقعدين"
+msgstr ""
 
 #: build/trans_presets.java:490
@@ -18831,7 +18971,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "حرّر جسر"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -18844,7 +18983,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "حرّر طريق للدراجات"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -18879,24 +19017,21 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "على أي حال ادمج"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "حرّر طريق قدم"
+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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "حرّر طريق قدم"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr ""
@@ -18904,5 +19039,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "درجات"
@@ -18912,5 +19047,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr ""
@@ -18918,10 +19053,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "تقاطع طرقات سريعة"
@@ -18929,15 +19064,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "حرّر تقاطع طرقات سريعة"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "الرقم"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "الخدمات"
@@ -18945,5 +19080,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr "حرّر محطة خدمات"
@@ -18951,5 +19086,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -18982,17 +19118,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "شركة الإدارة"
@@ -19001,5 +19137,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "إشارة سير"
@@ -19009,5 +19145,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr "نوع التقاطع للمشاة"
@@ -19016,27 +19152,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr "إشارات_السير"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "جزيرة"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr ""
@@ -19044,6 +19180,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr ""
@@ -19052,11 +19188,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -19064,30 +19200,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr "طير الطوقان"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr "نمر"
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "إشارة وقوف"
@@ -19095,5 +19231,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr "تقاطع مشاة"
@@ -19102,14 +19238,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr "مستديرة صغيرة"
@@ -19120,14 +19302,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr "الإتجاه"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr "إتجاه عقارب الساعة"
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr ""
@@ -19137,26 +19319,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "حدود المدينة"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr "الإسم الثاني"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "هاتف طوارئ"
@@ -19164,5 +19348,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr ""
@@ -19170,5 +19354,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr ""
@@ -19176,11 +19360,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr ""
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr ""
@@ -19188,5 +19379,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr ""
@@ -19194,5 +19385,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -19204,7 +19395,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "إرتفاع"
@@ -19212,5 +19403,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "حواجز"
@@ -19218,5 +19409,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr ""
@@ -19224,5 +19415,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr ""
@@ -19267,16 +19458,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "السير المسموح:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr "حاجز دراجة"
@@ -19285,5 +19476,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr ""
@@ -19291,5 +19482,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr ""
@@ -19297,10 +19488,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr ""
@@ -19308,15 +19499,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr ""
@@ -19324,5 +19515,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr ""
@@ -19330,10 +19521,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr "مراقبة الحدود"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr "حرّر مراقبة الحدود"
@@ -19343,5 +19534,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr ""
@@ -19350,12 +19541,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
-msgid "Fence"
-msgstr ""
-
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#: build/trans_presets.java:817 build/trans_presets.java:819
+msgid "Fence"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "حائط/جدار"
@@ -19363,5 +19566,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "حائط/جدار مدينة"
@@ -19370,5 +19573,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr ""
@@ -19380,15 +19583,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr ""
@@ -19396,50 +19600,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr ""
@@ -19447,25 +19651,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr ""
@@ -19476,11 +19680,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "الماء"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "نبع"
@@ -19488,5 +19692,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "حرّر نبع"
@@ -19494,5 +19698,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr "مسرب"
@@ -19500,10 +19704,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr "حرّر مسرب"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "جدول نهر"
@@ -19511,10 +19726,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "حرّر جدول نهر"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "قناة"
@@ -19522,10 +19737,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "حرّر قناة"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "نهر"
@@ -19535,5 +19750,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "نهر"
@@ -19541,15 +19756,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "حرّر الماء"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "الأرض اليابسة"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "حرّر الأرض اليابسة"
@@ -19557,15 +19772,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr "حوض"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr "حرّر حوض"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr "خزان"
@@ -19573,15 +19788,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr "حرّر خزان"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr "خزان مغطى"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr "حرّر خزان مغطى"
@@ -19589,5 +19804,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "ضفة نهر"
@@ -19596,10 +19811,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "حرّر ضفة نهر"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr "أراضي رطبة"
@@ -19610,14 +19825,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr "حرّ أراضي رطبة"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "مستنقع"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr ""
@@ -19631,35 +19846,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr "شجر إستوائي"
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "وحل"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr "حرّر وحل"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "شاطئ بحر"
@@ -19667,20 +19882,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "حرّر شاطئ بحر"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "خليج"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "حرّر خليج"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "منحدر صخري"
@@ -19688,10 +19903,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "حرّر منحدر صخري"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "شاطئ"
@@ -19699,5 +19914,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "حرّر شاطئ"
@@ -19705,5 +19920,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr ""
@@ -19711,5 +19926,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr ""
@@ -19718,5 +19933,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr "حوض سفن"
@@ -19724,10 +19939,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr "حرّر حوض سفن"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "مرسى"
@@ -19735,5 +19950,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr "حرّر مرسى"
@@ -19741,5 +19956,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "سدّ"
@@ -19747,15 +19962,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "حرّر سدّ"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr "نقطة مجرى ماء"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr ""
@@ -19764,5 +19979,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr "سدّ (صغير)"
@@ -19770,20 +19985,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr "سدّ (صغير)"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "شلال ماء"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "حرّر شلال ماء"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr ""
@@ -19792,15 +20007,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr "مارينا"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr "حرّر مارينا"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "رصيف ميناء"
@@ -19808,10 +20023,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "حرّر رصيف ميناء"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr ""
@@ -19819,10 +20034,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr ""
@@ -19832,20 +20047,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "سكة حديدية"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "سكة"
@@ -19853,5 +20068,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr "حرّر سكة"
@@ -19860,139 +20075,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr ""
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr ""
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr "سكة حديد"
+
+#. item "Man Made/Power Line" text "Line reference"
+#. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
+#: build/trans_presets.java:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr ""
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr "قطار ذات سكة حديد واحدة"
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr "حرّر قطار ذات سكة حديد واحدة"
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr ""
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr ""
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "قطار نفقي"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "حرّر قطار نفقي"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "ترام"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr "حرّر ترام"
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "سكة حديد غير مستعملة"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "حرّر سكة حديد غير مستعملة"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr ""
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr ""
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr ""
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr ""
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr "قطار ذات سكة حديد واحدة"
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr "حرّر قطار ذات سكة حديد واحدة"
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr ""
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr ""
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr ""
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr ""
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "قطار نفقي"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "حرّر قطار نفقي"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "ترام"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr "حرّر ترام"
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "سكة حديد غير مستعملة"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "حرّر سكة حديد غير مستعملة"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "سكة حديد مهجورة"
@@ -20001,5 +20455,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr ""
@@ -20008,5 +20462,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr ""
@@ -20016,5 +20470,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr ""
@@ -20022,5 +20476,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr ""
@@ -20029,10 +20483,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "مصعد كرسي"
@@ -20040,10 +20501,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr "حرّر مصعد كرسي"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr ""
@@ -20051,10 +20512,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr ""
@@ -20062,10 +20523,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr ""
@@ -20073,10 +20534,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20084,12 +20545,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr ""
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "وقود"
@@ -20099,9 +20573,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "حرّر وقود"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20155,32 +20686,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "أزقات الإفتتاح"
@@ -20239,94 +20770,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20338,5 +20945,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20346,5 +20953,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "موقف سيارات"
@@ -20355,25 +20962,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr "الرقم المرجعي"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "متعدد الطوابق"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "مساحة"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr "تحت الأرض"
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr ""
@@ -20382,48 +20989,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "رسم دخول/إجرة"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "غسيل سيارات"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "حرّر غسيل سيارات"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "تصليح سيارات"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "حرّر تصليح سيارات"
@@ -20431,5 +21038,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "إستئجار سيارة"
@@ -20438,10 +21045,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "حرّر إستئجار سيارة"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr "مشاركة السيارة"
@@ -20449,5 +21056,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr "حرّر مشاركة السيارة"
@@ -20455,10 +21062,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "حرّر موقف دراجة"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr "إستيعاب"
@@ -20467,15 +21074,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "حرر إستأجار دراجة"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "النقل المشترك"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -20485,5 +21092,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -20491,5 +21098,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr ""
@@ -20497,5 +21104,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr "موقف قطار"
@@ -20503,5 +21110,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr "حرّر موقف"
@@ -20509,5 +21116,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "موقف ترام"
@@ -20516,5 +21123,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "حرر موقف ترام"
@@ -20522,5 +21129,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "رصيف محطة القطار"
@@ -20529,5 +21136,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "حرّر رصيف محطة القطار"
@@ -20539,5 +21146,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr ""
@@ -20545,10 +21152,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr "مساحة"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "مدخل قطار نفقي"
@@ -20557,10 +21164,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "حرّر مدخل قطار نفقي"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr "مناسب لكرسي المقعدين"
@@ -20569,5 +21176,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "محطة حافلة نقل جماعي (باص)"
@@ -20576,5 +21183,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "حرّر محطة حافلة نقل جماعي (باص)"
@@ -20582,5 +21189,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "موقف محطة حافلة نقل جماعي"
@@ -20590,5 +21197,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "حرّر موقفحافلة نقل جماعي (باص)"
@@ -20597,25 +21204,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr "ملجأ"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr ""
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr ""
@@ -20623,5 +21231,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "تاكسي"
@@ -20629,5 +21237,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "حرّر موقف تاكسي"
@@ -20635,32 +21243,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "مطار"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr ""
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr ""
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr ""
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "مكان المبيت"
@@ -20672,5 +21375,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "فندق"
@@ -20679,15 +21382,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "حرّر فندق"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "النجوم"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr "فندق (رخيص)"
@@ -20695,20 +21398,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr "حرّر فندق (رخيص)"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr "بيت ضيافة"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr "حرّر بيت ضيافة"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "كوخ"
@@ -20716,10 +21419,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr "حرّر كوخ"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr "نزل"
@@ -20727,30 +21430,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr "حرّر نزل"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr "كوخ جبلي"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr "حرّر كوخ جبلي"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr "موقع قافلة"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr "حرّر موقع قافلة"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "موقع تخييم"
@@ -20758,10 +21461,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr "حرّر موقع تخييم"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "طعام و شراب"
@@ -20772,5 +21475,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "مطعم"
@@ -20778,5 +21481,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "حرّر مطعم"
@@ -20784,5 +21487,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr "الطبخ"
@@ -20790,61 +21493,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "إيطالي"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "صيني"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "معجنات إيطالية (بيزا)"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "هامبرغر"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "يوناني"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "ألماني"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "هندي"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "محلي/إقليمي"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr "كباب / شورما"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "تركي"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "آسيوي"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "تايلاندي"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "مكسيكي"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "ياباني"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "وجبات سريعة"
@@ -20852,9 +21567,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "حرّر مطعم وجبات السريعة"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "مقهى إستراحة"
@@ -20862,9 +21585,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "حرّر مقهى إستراحة"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "حانة"
@@ -20872,18 +21595,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "حرّر حانة"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr "حانة شرب الجعة"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr "حرّر حانة شرب الجعة"
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr "حانة"
@@ -20891,9 +21614,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr "حرّر حانة"
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "نادي سهر / نادي ليلي"
@@ -20901,24 +21624,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "حرّر نادي سهر/ نادي ليلي"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "سياحة"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "متحف"
@@ -20926,9 +21649,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "حرّر متحف"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "حديقة حيوانات"
@@ -20937,9 +21660,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "حرّر حديقة حيوانات"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "موقع كاشف"
@@ -20947,24 +21670,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr "برج مراقبة"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "أعمال فنية"
@@ -20972,5 +21695,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "حرّر أعمال فنية"
@@ -20978,19 +21701,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr "مكتب إستعلامات"
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "الخريطة"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr ""
@@ -21028,5 +21751,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -21034,28 +21757,28 @@
 msgstr "شارع"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr ""
@@ -21065,5 +21788,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr ""
@@ -21071,5 +21794,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr ""
@@ -21077,6 +21800,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "ركب الدراجة"
@@ -21084,5 +21807,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr ""
@@ -21090,6 +21813,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "تزلّج"
@@ -21097,5 +21820,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr ""
@@ -21103,46 +21826,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr "لوحة معلومات"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "التاريخ"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr "الطبيعة"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr "الحيوانات الضارة"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr ""
@@ -21150,29 +21873,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr "حرّر ملجأ"
@@ -21180,25 +21903,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "موقع تنزه"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "حرّر موقع تنزه"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "مواقع تاريخية"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "قلعة"
@@ -21207,19 +21930,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "حرّر قلعة"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "أطلال"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "حرّر أطلال"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "موقع أثري"
@@ -21228,9 +21951,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "حرّر موقع أثري"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "ساحة معركة"
@@ -21238,10 +21961,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "حرّر ساحة معركة"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr ""
@@ -21249,5 +21972,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -21255,15 +21978,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "نصب تذكاري"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "حرّر نصب تذكاري"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "ضريح"
@@ -21271,55 +21994,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "حرّر ضريح"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr "ضريح/مزار"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr "حرّر مزار/ضريح"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "وقت الفراغ"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "حديقة ألعاب مائية"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "حرّر حديقة ألعاب مائية"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "ملعب"
@@ -21327,35 +22050,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "حرّر ملعب"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "صيد السمك"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "حرّر صيد السمك"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr "المرافق الرياضية"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "مدرج ألعاب رياضية"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "حرّر مدرج ألعاب رياضية"
@@ -21369,6 +22092,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "إختر الرياضة :"
@@ -21760,6 +22483,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -21793,225 +22516,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr "متعدد"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "أسلحة الرماية"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "كرة القدم الأوسترالية"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "كرة المضرب"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "كرة السلّة"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "التسلق"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "ركوب الدراجة"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr "سبق الكلاب"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr "ركوب الخيل"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "الجمباز"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr "سبق الخيل"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr "رياضة المحركات"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "التزلج"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "كرة القدم"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "السباحة"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "تنس الطاولة"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "التنس"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "مركز/نادي  رياضي"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "حرّر مركز/نادي رياضي"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "رياضة"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr "متعدد"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr ""
@@ -22050,21 +22773,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "النوع"
@@ -22103,203 +22826,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "مركز/نادي رياضي"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "مدرج ألعاب رياضية"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "سلاح الرامي"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "حرّر سلاح الرامي"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "تسلق"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "حرّر تسلق"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr "غدف"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr "حرّر غدف"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr "حرّر ركب الدراجة"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "سباق الكلاب"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr "حرّر سباق الكلاب"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr "فروسي"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr "حرّر فروسي"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr "سباق الخيل"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr "حرّر سباق الخيل"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "رياضة بدنية"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr "حرّر رياضة بدنية"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "رياضة المحركات"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr "حرّر رياضة المحركات"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr "تزحلق"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr "حرّر تزحلق"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "سباحة"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "حرّر سباحة"
@@ -22307,56 +23030,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr "حرّر تزلّج"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr "نزولاً"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr "شمالي"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr "الصعوبة"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr "مبتدئ"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr "سهل"
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr ""
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr "خبير"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "رماية"
@@ -22364,182 +23083,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "حرّر رماية"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "رياضة (كرة)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr ""
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "كرة القدم"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr "حرّر كرة القدم"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "كرة السلّة"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "حرّر كرة السلّة"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "تنس الطاولة"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "حرّر تنس الطاولة"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "تنس"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "حرّر تنس"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "مباني"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "مبنى"
@@ -22547,5 +23266,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "مبنى عام"
@@ -22553,10 +23272,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "حرّر مبنى عام"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "مبنى البلدية"
@@ -22564,10 +23283,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "حرّر مبنى البلدية"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "سفارة"
@@ -22575,10 +23294,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "حرّر سفارة"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "محكمة"
@@ -22587,10 +23306,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "حرّر محكمة"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "سجن"
@@ -22599,10 +23318,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "حرّر سجن"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "شرطة"
@@ -22612,10 +23331,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "حرّر شرطة"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "فوج إطفاء"
@@ -22624,10 +23343,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "حرّر فوج إطفاء"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "مكتب البريد"
@@ -22635,5 +23354,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "حرّر مكتب البريد"
@@ -22641,15 +23360,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "حضانة أطفال"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "حرّر حضانة أطفال"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "مدرسة"
@@ -22657,10 +23376,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "حرّر مدرسة"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "جامعة"
@@ -22668,10 +23387,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "حرّر جامعة"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "كلّية"
@@ -22679,5 +23398,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "حرّر كلّية"
@@ -22685,5 +23404,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "سينما"
@@ -22692,10 +23411,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "حرّر سينما"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "مكتبة"
@@ -22704,9 +23423,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "حرّر مكتبة"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "مركز ثقافي"
@@ -22714,10 +23433,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "حرّر مركز ثقافي"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "مسرح"
@@ -22726,10 +23445,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "حرّر مسرح"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "معبد"
@@ -22739,5 +23458,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "حرّر معبد"
@@ -22746,6 +23465,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "الديانة"
@@ -22754,66 +23473,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr "بهائي"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "بوذي"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "نصراني"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "هندوس"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "يهودي"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "مسلم"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr "سيخ"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr "روحاني"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr "الطقوس الدينية"
@@ -22822,81 +23541,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "معمداني"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "كثليك"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr "إنجيلي"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr "شهود يهوه"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "لوثري"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr "منهجي"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "أرثدكس"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "بروتستاني"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr "شيعي"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr "سنّي"
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "عناوين"
@@ -22905,5 +23624,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "حرّر معلومات عنوان"
@@ -22911,5 +23630,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "رقم المنزل"
@@ -22917,25 +23636,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "تسمية المنزل"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "إسم الشارع"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "إسم المدينة"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "الرمز البريدي"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "رمز البلد"
@@ -22944,5 +23663,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "حرّر إستيفاء العنوان"
@@ -22950,61 +23669,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr "مخطط الترقيم"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "مفرد"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "مثنى"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr "من صنع الإنسان"
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "المصانع"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "حرّر المصانع"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "برج"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "حرّر برج"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr ""
@@ -23012,25 +23731,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "خزان / برج مياه"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "حرّر خزان/برج مياه"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "خزان محروقات"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "حرّر خزان المحروقات"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "منارة"
@@ -23038,10 +23757,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "حرّر منارة"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "طاحونة هوائية"
@@ -23049,10 +23768,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "حرّر طاحونة هوائية"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "خط أنابيب"
@@ -23061,37 +23780,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "حرّر خط أنابيب"
 
-#: build/trans_presets.java:2198
-msgid "oil"
-msgstr ""
-
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
 msgid "gas"
 msgstr "غاز"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr ""
+
+#: build/trans_presets.java:2353
+msgid "oil"
+msgstr ""
+
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "محطّة تكرير مياه"
@@ -23101,10 +23820,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "حرّر محطّة تكرير مياه"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "ونش"
@@ -23112,21 +23831,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "حرّر ونش"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr "عمود إضائة"
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr "حرّر عمود إضاءة"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "نقطة رؤية"
@@ -23134,10 +23848,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "حرّر نقطة رؤية"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "مراقبة"
@@ -23145,11 +23859,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "حرّر كامرة مراقبة"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "مولد طاقة"
@@ -23159,35 +23885,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "حرّر مولد طاقة"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "أرياح"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "مائية"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "طاقة أحفورية"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "نووية"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "فحم"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr "كهرباء شمسية"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "محطة توليد طاقة"
@@ -23196,10 +23922,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "حرّر محطة توليد طاقة"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "محطة طاقة فرعية"
@@ -23208,5 +23934,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "حرّر محطة طاقة فرعية"
@@ -23214,10 +23940,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr "رقم الخط"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "عمود كهربائي"
@@ -23228,23 +23954,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "حرّر عمود كهربائي"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "سلك/خط كهربائي"
@@ -23253,79 +23979,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "حرّر عمود كهربائي"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr ""
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "التوتر"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr "خدمات/نافعات"
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "مراحيض"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr "الملاحظة"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "صندوق بريد"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "هاتف"
@@ -23334,5 +24055,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "حرّر هاتف"
@@ -23340,5 +24061,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "عملات معدنية"
@@ -23346,5 +24067,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "الملاحظات"
@@ -23352,5 +24073,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -23358,5 +24079,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr ""
@@ -23364,15 +24085,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "بطاقات إعتماد"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "بطاقات هاتفية"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "إعادة تصنيع الأشياء"
@@ -23381,5 +24102,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "حرّر إعادة تصنيع الأشياء"
@@ -23387,31 +24108,42 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "بطاريات"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "علب (معدنية)"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "ملابس"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "زجاج"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "ورق"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+msgid "Edit Waste Basket"
 msgstr ""
 
@@ -23419,31 +24151,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr ""
@@ -23522,5 +24254,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -23530,31 +24262,31 @@
 msgstr "خضار"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -23563,30 +24295,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "الإرتفاع"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr "منخفض"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr "نصف"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr "ملء"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr "مخبئ"
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "نافورة"
@@ -23595,10 +24327,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "حرّر نافورة"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "ماء شفة"
@@ -23607,10 +24339,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "حرّر ماء شفة"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr ""
@@ -23618,15 +24363,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "مَتاجر/دكاكين"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr ""
@@ -23634,10 +24379,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "حرّر متجر سيارات"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr ""
@@ -23646,28 +24391,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "حرر مبيع قطع دراجات"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "سوبرماركت"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "حرّر سوبرماركت"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr ""
@@ -23675,9 +24420,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "كشك"
@@ -23685,27 +24430,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "حرّر كشك"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "آلة بيع"
@@ -23713,5 +24458,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr ""
@@ -23719,88 +24464,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "نوعية المبيعات"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr "تذاكر_النقل_العام"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr "خرائط_النقل_العام"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr "تذاكر_موقف_سيارات"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "مأكولات"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "مشروبات"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "حلويات"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "سجائر"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "صور"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "مأكولات للحيوانات"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "جرائد"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "ألعاب"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "طوابع"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "رقائق SIM"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr "قسائم تعبئة هاتفية"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr "قسائم"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "مانع الحمل"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr "سدادات قطنية"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "جزار"
@@ -23808,9 +24553,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "حرّر جزار"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "خباز"
@@ -23818,9 +24563,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "حرّر خباز"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "بائع الزهور"
@@ -23828,18 +24573,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "حرّر بائع الزهور"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr "مأكولات عضوية"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr "حرّر مبيع مأكولات عضوية"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr ""
@@ -23847,54 +24592,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr "مشروبات"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr "حاسوب"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "حرّر مبيع قطع حاسوب"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr "إلكترونيات"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "حرّر إلكترونيات"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr "حرّر مبيع Hifi"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr "أثاث/فرش"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "حرّر مبيع فرش/أثاث"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr ""
@@ -23902,9 +24647,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr "خردوات/أدوات منزلية"
@@ -23912,9 +24657,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr "حرّر مخزن خردوات/أدوات منزلية"
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -23922,54 +24667,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr "قرطاسية"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr "حرّر مبيع قرطاسية"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "حلاق"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "حرّر حلاق"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr "أحذية"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "حرّر أحذية"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr "ألعاب"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "حرّر مبيع ألعاب"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr "مرئيّات"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr "حرّر مبيع مرئيّات"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "تنظيف جاف"
@@ -23977,9 +24722,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "حرّر تنظيف جاف"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "مصبغة/غسيل"
@@ -23987,9 +24732,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "حرّر مصبغة/غسيل"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr "نشاطات في الخلاء"
@@ -23997,28 +24742,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr "حرّر متجر نشاطات في الخلاء"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr "حرّرمبيع  لوازم للأنشطة رياضية"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "حرّر نظاراتي"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "نقود/أموال"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "مصرف"
@@ -24026,14 +24771,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "حرّر مصرف"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "صرّاف آلي"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "صرّاف"
@@ -24041,5 +24786,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "حرّر صرّاف"
@@ -24047,15 +24792,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "حرّر صراف آلي"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "صحة"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "أطباء"
@@ -24063,18 +24808,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "حرّر أطباء"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "طبيب أسنان"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "حرّر طبيب أسنان"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "صيدلية"
@@ -24082,5 +24827,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "حرّر صيدلية"
@@ -24088,9 +24833,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "مستشفى"
@@ -24098,10 +24843,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "حرّر مستشفى"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr "نقطة دخول طوارئ"
@@ -24110,5 +24855,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr "حرّر نقطة دخول طوارئ"
@@ -24117,20 +24862,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr "رقم النقطة"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr "إسم النقطة"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "رقم الهاتف"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr "إستعمل رمز دولي مثل 12-345-67890"
@@ -24138,5 +24883,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "بيطري"
@@ -24145,64 +24890,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "حرّر بيطري"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "الأماكن"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "قارة"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "حرّر قارة"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "وطن"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "حرّر وطن"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "دولة/ولاية"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "حرّر دولة/ولاية"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "قطر/منطقة"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "حرّر قطر/منطقة"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr ""
@@ -24210,15 +24955,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "مدينة"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "حرّر مدينة"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "بلدة"
@@ -24226,10 +24971,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "حرّر بلدة"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "ضاحية"
@@ -24237,25 +24982,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "حرّر ضاحية"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "قرية"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "حرّر قرية"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "قرية صغيرة"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "حرّر قرية صغيرة"
@@ -24263,5 +25008,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr "محلة"
@@ -24269,10 +25014,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr "حرّر محلة"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "جزيرة"
@@ -24280,10 +25025,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "حرّر جزيرة"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr ""
@@ -24291,5 +25036,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr ""
@@ -24297,5 +25042,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "مدخل كهف"
@@ -24303,10 +25048,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "حرّر مدخل كهف"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "قمّة"
@@ -24314,10 +25059,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "حرّر قمّة"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "جليد"
@@ -24325,10 +25070,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "حرّر جليد"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "بركان"
@@ -24336,70 +25081,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "حرّر بركان"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "الحدود"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "دولية"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "حرّر حدود دولية"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "إدارية"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "حرّر حدود إدارية"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr "مدنية"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr "حرّر حدود إدارية"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "حرّر الحدود السياسية"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr "محمية وطنية (بيئية)"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "حرّر محمية وطنية (التنوع البيئي)"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "إستعمال الأرض"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "شجرة"
@@ -24408,15 +25153,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "حرّر شجرة"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "حرّر اإسم النباتي"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "حرج"
@@ -24425,5 +25170,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "حرّر حرج"
@@ -24431,17 +25176,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "صنوبري الثمر"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "مختلط"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "غابة"
@@ -24450,14 +25195,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "حرّر غابة"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "محمية طبيعية"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "حرّر محمية طبيعية"
@@ -24465,25 +25210,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr "حصاة"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr "حرّر حصاة"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr "أشجار منخفضة"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr "حرّر أشجار منخفضة"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr ""
@@ -24491,10 +25236,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr "هوّة"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr ""
@@ -24502,5 +25247,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "حرّر أرض بور"
@@ -24508,5 +25253,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr "فناء مزرعة"
@@ -24515,45 +25260,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr "حرّر فناء مزرعة"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "أرض زراعية"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr "حرّر أرض زراعية"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr "مرج"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr "حرّر مرج"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "كرم عنب"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "حرّر كرم عنب"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr "حصص سكنية"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr "حرّر حصص سكنية"
@@ -24561,25 +25306,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "حديقة"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "حرّر حديقة"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "عشب"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr ""
@@ -24587,10 +25332,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr "شائع"
@@ -24598,20 +25343,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr "حرّر شائع"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "متنزه"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "حرّر متنزه"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr "ميدان ألعاب"
@@ -24619,5 +25364,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr "حرّر ميدان ألعاب"
@@ -24625,15 +25370,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "منطقة سكنية"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr "حرّر منطقة سكنية"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "مقبرة"
@@ -24641,9 +25386,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "حرّر مقبرة"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "مقبرة"
@@ -24651,39 +25396,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "حرّر إستعمال الأرض كمقبرة"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "بيع بلمفرق"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr "حرّر بيع بلمفرق"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "تجاري"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr "حرّر إستعمال تجاري للأرض"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "صناعي"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr "حرّر الإستعمال الصناعي"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr "أرض سكة حديد"
@@ -24691,15 +25436,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr "حرّر أرض سكة حديد"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "عسكري"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr "حرّر الإستخدام العسكري للأرض"
@@ -24707,50 +25452,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "موقع ورشة إعمار"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "حرّر موقع ورشة إعمار"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr "حقل أخضر"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr "حرّر إستعمال الأرض كحقل أخضر"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr "مطمر نفايات"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr "حرّر مطمر نفايات"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "كسّارة، مقلع حجارة"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "حرّر كسّارة / مقلع حجارة"
@@ -24760,5 +25505,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr "حرّر متعدد الضلوع"
@@ -24767,10 +25512,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr "الفلق الخارجي"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr "حرّر الفلق الخارجي"
@@ -24778,5 +25523,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr "حصر الإنعطاف"
@@ -24785,5 +25530,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr "حرّر حصر الإنعطاف"
@@ -24791,34 +25536,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr "حصر"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr "إنعطاف_يمين_ممنوع"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr "على_الطول_ممنوع"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr "رجوع_ممنوع"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr "إنعطاف_يميني_فقط"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr "على_الطول_فقط"
@@ -24827,15 +25572,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr "من الطريق"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr "مروراً بلعقدة أو الطريق"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr "إلى الطريق"
@@ -24843,5 +25588,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr "الطريق"
@@ -24850,5 +25595,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr "حرّر طريق"
@@ -24856,5 +25601,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr "نوع الطريق"
@@ -24945,5 +25690,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -24953,17 +25698,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr "حافلة (باص)"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr "الطريق"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr "عبارة بحرية"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr ""
@@ -25023,5 +25768,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -25030,9 +25775,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr "ترام"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr ""
@@ -25046,10 +25791,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr "وصف الرمز"
@@ -25057,31 +25802,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr "الشبكة"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr "المقترح"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr "البديل"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr "المؤقت"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr "الإتصال"
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr "اللون (hex)"
@@ -25090,107 +25835,32 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr "فلق الطريق"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr "الفلق الأمامي"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr "الفلق الخلفي"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr "نقطة التوقف"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr "نقطة التوقف الأمامية"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 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"
@@ -25726,77 +26396,4 @@
 msgid "highway_track"
 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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
-msgstr "سكة حديد"
 
 #. color rail
@@ -26184,7 +26781,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "معمداني"
+msgstr ""
 
 #. color manmade
@@ -29323,12 +29919,240 @@
 msgstr ""
 
+#~ msgid "Update"
+#~ msgstr "حدّث"
+
+#~ msgid "Unknown version"
+#~ msgstr "نسخة مجهولة"
+
+#~ msgid "Incorrect password or username."
+#~ msgstr "الإسم أو كلمة المرور خطأ"
+
+#~ msgid "Enter Password"
+#~ msgstr "أدخل كلمة المرور"
+
+#~ msgid "Do not show again"
+#~ msgstr "لا تظهر مرة اخرى"
+
+#~ msgid "false"
+#~ msgstr "خاطئ"
+
+#~ msgid "true"
+#~ msgstr "حقيقي"
+
+#~ msgid "different"
+#~ msgstr "مختلف"
+
+#~ msgid "Rotate"
+#~ msgstr "أدر"
+
+#~ msgid "Move"
+#~ msgstr "حرك"
+
+#~ msgid "unnamed"
+#~ msgstr "غيرمسمى"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "دمج العقد رغم عضويتها المختلفة ؟"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "لم تفتح أي مستند لذالك لم يتم تحميل أي شيء."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "إمتداد ملف غير معروف."
+
+#~ msgid "Email"
+#~ msgstr "البريد الإلكتروني"
+
+#~ msgid "Contact {0}..."
+#~ msgstr "إتصل بــ {0}..."
+
+#~ msgid "Only two nodes allowed"
+#~ msgstr "مسموح فقط عقدتين"
+
+#~ msgid "No data imported."
+#~ msgstr "لم يتم تحميل أي معطيات"
+
+#~ msgid "Data Layer"
+#~ msgstr "طبقة المعطيات"
+
+#~ msgid "Open in Browser"
+#~ msgstr "إفتح في المتصفح"
+
+#~ msgid "File not found"
+#~ msgstr "لم يُعثر على الملف"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "الرجاء إدخال مصطلحات البحث"
+
+#~ msgid "zoom"
+#~ msgstr "تكبير/تصغير"
+
+#~ msgid "name"
+#~ msgstr "الإسم"
+
+#~ msgid "citymap"
+#~ msgstr "خريطة المدينة"
+
+#~ msgid "map"
+#~ msgstr "خريطة"
+
+#~ msgid "Be sure to include the following information:"
+#~ msgstr "تأكد  من ضمّ المعلومات التالية:"
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "ردّ الخادم بخطأ داخلي. حاول مرة ثانية بمنطقة أصغر أو إنتظر بعض الوقت."
+
+#~ msgid "Preparing..."
+#~ msgstr "اعداد..."
+
+#~ msgid "Login"
+#~ msgstr "دخول"
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "إختر أولاً إشارة مرجعية"
+
+#~ msgid "Please report a ticket at {0}"
+#~ msgstr "الرجاء التبليغ بواسطة بطاقة عند {0}"
+
+#~ msgid "Include your steps to get to the error (as detailed as possible)!"
+#~ msgstr "دلّ على الخطوات اللتي أوصلتك إلى هذا الخطأ ( بطريقة مفصلة)"
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "لا يوجد لــ <nd>  أي مرجع"
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "ضذوذ تكوين معرف العقدة"
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "إجهاض عملية النقل لسبب خطأ ( سأنتظر 5 ثواني ):"
+
+#~ msgid "Uploading..."
+#~ msgstr "جاري الإرسال..."
+
+#~ msgid "Edit Properties"
+#~ msgstr "حرّر الخصائص"
+
+#~ msgid "Object"
+#~ msgstr "الغرض"
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "غير قادر على الإتصال بلمخدم."
+
+#~ msgid "Authors: {0}"
+#~ msgstr "المؤلفون: {0}"
+
+#~ msgid "Error during parse."
+#~ msgstr "خطأ تحليل نحوي"
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "إستعمل التعيينات المسبقة التعريف ''{0}''"
+
+#~ msgid "Occupied By"
+#~ msgstr "المشغول من"
+
+#~ msgid "Remove Selected"
+#~ msgstr "أزل المختارة"
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "أضف كلّ الأغراض المختارة حالياً كأعضاء"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "أنقر إعادة التعبئة لإنعاش اللائحة"
+
+#~ msgid "Revert"
+#~ msgstr "إسترجع"
+
+#~ msgid "Error parsing server response."
+#~ msgstr "خطأ عند التحليل النحوي لردّ المخدم."
+
+#~ msgid "Delete the selected layer."
+#~ msgstr "أمحي الطبقة المختارة."
+
+#~ msgid "Merging conflicts."
+#~ msgstr "دمج التناقضات."
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "التناقضات: {0}"
+
+#~ msgid "Images for {0}"
+#~ msgstr "الصول لِــ {0}"
+
+#~ msgid "Read GPX..."
+#~ msgstr "إقرءGPX..."
+
+#~ msgid "No time for point {0} x {1}"
+#~ msgstr "لا توقيت للنقطة {0} x {1}"
+
+#~ msgid "timezone difference: "
+#~ msgstr "إختلاف في التوقيت الجغرافي: "
+
+#~ msgid "Image"
+#~ msgstr "الصورة"
+
+#~ msgid "{0} within the track."
+#~ msgstr "{0} من ضمن المسلك."
+
+#~ msgid "Proxy server host"
+#~ msgstr "مضيف مخدم التوكيل"
+
+#~ msgid "Anonymous"
+#~ msgstr "بدون ذكر الإسم"
+
+#~ msgid "Proxy server port"
+#~ msgstr "منفذ مخدم التوكيل"
+
+#~ msgid "Proxy server username"
+#~ msgstr "الإسم على مخدم التوكيل"
+
+#~ msgid "Proxy server password"
+#~ msgstr "كلمة المرور عند مخدم التوكيل"
+
+#~ msgid "Set the language."
+#~ msgstr "عيّن اللغة"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "Deleted member ''{0}'' in relation."
+#~ msgstr "أمحي العضو ''{0}'' في العلاقة."
+
+#~ msgid "Empty member in relation."
+#~ msgstr "عضو فارغ في العلاقة."
+
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr "يمكنك إستعمال الفأرة أو المفاتيح Ctrl+سهم كي تكبر/تصغر أو للإزاحة"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "غير قادر على قراءة نتائج بحث عن الإسم من الخادم"
+
+#~ msgid "bicyclemap"
+#~ msgstr "خريطة راكب دراجة"
+
+#~ msgid "Edit Station"
+#~ msgstr "حرّر محطة"
+
 #~ msgid "Footway"
 #~ msgstr "طريق قدم"
 
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "لا يجب على المتغير  ''{0}'' أن يكون صفراً"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "لا يجب على المتغير  ''{0}'' أن يكون صفراً"
+#~ msgid "There were conflicts during import."
+#~ msgstr "حصل تعارض حين الإستيراد."
+
+#~ msgid "Move Down"
+#~ msgstr "حرّك إلى الأسفل"
+
+#~ msgid "Move Up"
+#~ msgstr "حرّك إلى الأعلى"
+
+#~ msgid "Relation Editor: {0}"
+#~ msgstr "محرّر العلاقات: {0}"
+
+#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
+#~ msgstr "غير قادر على قراءة الزمن \"{0}\" من النقطة {1} x {2}"
+
+#~ msgid "current delta: {0}s"
+#~ msgstr "الإنحراف الحالي: {0}ث"
 
 #~ msgid "image"
@@ -29341,241 +30165,4 @@
 #~ msgstr[5] "صور"
 
-#~ msgid "Update"
-#~ msgstr "حدّث"
-
-#~ msgid "Unknown version"
-#~ msgstr "نسخة مجهولة"
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "الإسم أو كلمة المرور خطأ"
-
-#~ msgid "Enter Password"
-#~ msgstr "أدخل كلمة المرور"
-
-#~ msgid "Do not show again"
-#~ msgstr "لا تظهر مرة اخرى"
-
-#~ msgid "false"
-#~ msgstr "خاطئ"
-
-#~ msgid "true"
-#~ msgstr "حقيقي"
-
-#~ msgid "different"
-#~ msgstr "مختلف"
-
-#~ msgid "Rotate"
-#~ msgstr "أدر"
-
-#~ msgid "Move"
-#~ msgstr "حرك"
-
-#~ msgid "unnamed"
-#~ msgstr "غيرمسمى"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "دمج العقد رغم عضويتها المختلفة ؟"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "لم تفتح أي مستند لذالك لم يتم تحميل أي شيء."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "إمتداد ملف غير معروف."
-
-#~ msgid "Email"
-#~ msgstr "البريد الإلكتروني"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "إتصل بــ {0}..."
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "مسموح فقط عقدتين"
-
-#~ msgid "No data imported."
-#~ msgstr "لم يتم تحميل أي معطيات"
-
-#~ msgid "Data Layer"
-#~ msgstr "طبقة المعطيات"
-
-#~ msgid "Open in Browser"
-#~ msgstr "إفتح في المتصفح"
-
-#~ msgid "File not found"
-#~ msgstr "لم يُعثر على الملف"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "الرجاء إدخال مصطلحات البحث"
-
-#~ msgid "zoom"
-#~ msgstr "تكبير/تصغير"
-
-#~ msgid "name"
-#~ msgstr "الإسم"
-
-#~ msgid "citymap"
-#~ msgstr "خريطة المدينة"
-
-#~ msgid "map"
-#~ msgstr "خريطة"
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "تأكد  من ضمّ المعلومات التالية:"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "ردّ الخادم بخطأ داخلي. حاول مرة ثانية بمنطقة أصغر أو إنتظر بعض الوقت."
-
-#~ msgid "Preparing..."
-#~ msgstr "اعداد..."
-
-#~ msgid "Login"
-#~ msgstr "دخول"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "إختر أولاً إشارة مرجعية"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "الرجاء التبليغ بواسطة بطاقة عند {0}"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr "دلّ على الخطوات اللتي أوصلتك إلى هذا الخطأ ( بطريقة مفصلة)"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "لا يوجد لــ <nd>  أي مرجع"
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "ضذوذ تكوين معرف العقدة"
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "إجهاض عملية النقل لسبب خطأ ( سأنتظر 5 ثواني ):"
-
-#~ msgid "Uploading..."
-#~ msgstr "جاري الإرسال..."
-
-#~ msgid "Edit Properties"
-#~ msgstr "حرّر الخصائص"
-
-#~ msgid "Object"
-#~ msgstr "الغرض"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "غير قادر على الإتصال بلمخدم."
-
-#~ msgid "Authors: {0}"
-#~ msgstr "المؤلفون: {0}"
-
-#~ msgid "Error during parse."
-#~ msgstr "خطأ تحليل نحوي"
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "إستعمل التعيينات المسبقة التعريف ''{0}''"
-
-#~ msgid "Occupied By"
-#~ msgstr "المشغول من"
-
-#~ msgid "Remove Selected"
-#~ msgstr "أزل المختارة"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "أضف كلّ الأغراض المختارة حالياً كأعضاء"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "أنقر إعادة التعبئة لإنعاش اللائحة"
-
-#~ msgid "Revert"
-#~ msgstr "إسترجع"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "خطأ عند التحليل النحوي لردّ المخدم."
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "أمحي الطبقة المختارة."
-
-#~ msgid "Merging conflicts."
-#~ msgstr "دمج التناقضات."
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "التناقضات: {0}"
-
-#~ msgid "Images for {0}"
-#~ msgstr "الصول لِــ {0}"
-
-#~ msgid "Read GPX..."
-#~ msgstr "إقرءGPX..."
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "لا توقيت للنقطة {0} x {1}"
-
-#~ msgid "timezone difference: "
-#~ msgstr "إختلاف في التوقيت الجغرافي: "
-
-#~ msgid "Image"
-#~ msgstr "الصورة"
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} من ضمن المسلك."
-
-#~ msgid "Proxy server host"
-#~ msgstr "مضيف مخدم التوكيل"
-
-#~ msgid "Anonymous"
-#~ msgstr "بدون ذكر الإسم"
-
-#~ msgid "Proxy server port"
-#~ msgstr "منفذ مخدم التوكيل"
-
-#~ msgid "Proxy server username"
-#~ msgstr "الإسم على مخدم التوكيل"
-
-#~ msgid "Proxy server password"
-#~ msgstr "كلمة المرور عند مخدم التوكيل"
-
-#~ msgid "Set the language."
-#~ msgstr "عيّن اللغة"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Deleted member ''{0}'' in relation."
-#~ msgstr "أمحي العضو ''{0}'' في العلاقة."
-
-#~ msgid "Empty member in relation."
-#~ msgstr "عضو فارغ في العلاقة."
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr "يمكنك إستعمال الفأرة أو المفاتيح Ctrl+سهم كي تكبر/تصغر أو للإزاحة"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "غير قادر على قراءة نتائج بحث عن الإسم من الخادم"
-
-#~ msgid "bicyclemap"
-#~ msgstr "خريطة راكب دراجة"
-
-#~ msgid "Station"
-#~ msgstr "محطة"
-
-#~ msgid "Edit Station"
-#~ msgstr "حرّر محطة"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "حصل تعارض حين الإستيراد."
-
-#~ msgid "Move Down"
-#~ msgstr "حرّك إلى الأسفل"
-
-#~ msgid "Move Up"
-#~ msgstr "حرّك إلى الأعلى"
-
-#~ msgid "Relation Editor: {0}"
-#~ msgstr "محرّر العلاقات: {0}"
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "غير قادر على قراءة الزمن \"{0}\" من النقطة {1} x {2}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "الإنحراف الحالي: {0}ث"
-
 #~ msgid "Conflicting relation"
 #~ msgstr "علاقة متناقضة"
@@ -29673,7 +30260,4 @@
 #~ msgid "Board Type"
 #~ msgstr "نوع اللوحة"
-
-#~ msgid "board"
-#~ msgstr "اللوح"
 
 #~ msgid "Upload to OSM..."
@@ -29723,2 +30307,8 @@
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "لم أتمكن من قراءة \"{0}\""
+
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "لا يجب على المتغير  ''{0}'' أن يكون صفراً"
+
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "لا يجب على المتغير  ''{0}'' أن يكون صفراً"
Index: applications/editors/josm/i18n/po/bg.po
===================================================================
--- applications/editors/josm/i18n/po/bg.po	(revision 19689)
+++ applications/editors/josm/i18n/po/bg.po	(revision 19698)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-19 00:01-0500\n"
-"PO-Revision-Date: 2010-01-14 14:48-0500\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-23 21:56+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\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-01-13 18:29+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -70,11 +70,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -240,5 +240,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -252,13 +252,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -267,5 +267,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -291,5 +294,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Обединение"
@@ -320,5 +323,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -385,9 +388,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -395,5 +398,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "ОК"
@@ -444,6 +449,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -461,5 +466,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -468,11 +473,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -509,5 +514,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "конфликт"
@@ -642,14 +647,14 @@
 msgstr "Моля, изберете поне две линии за комбиниране."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Копиране"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Копиране на избраните обекти в буфера за обмен."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Моля, изберете нещо за копиране."
@@ -680,8 +685,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -690,5 +695,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -746,16 +751,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "{0} конфликт(а) при въвеждането"
-msgstr[1] "{0} конфликт(а) при въвеждането"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "Проблеми при свалянето"
-msgstr[1] "Проблеми при свалянето"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -776,4 +780,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -784,4 +790,32 @@
 msgstr ""
 "Създай копие на селектираните обекти чрез копиране и незабавно поставяне."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Повтарящи се линии"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+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:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "Слой: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, 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 ""
 
 #. <button label="Info" hotkey="I">
@@ -872,10 +906,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 msgid "The selected way has nodes outside of the downloaded data region."
 msgid_plural ""
 "The selected ways have nodes outside of the downloaded data region."
-msgstr[0] "Избраният път не съдържа избраната точка."
-msgstr[1] "Избраният път не съдържа избраните точки"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -996,5 +1029,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "URL"
@@ -1145,5 +1178,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr ""
 
@@ -1157,9 +1190,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Отваряне на файлове"
-msgstr[1] "Отваряне на файлове"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1182,7 +1215,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
-#, fuzzy
 msgid "Select if the data should be downloaded into a new layer"
-msgstr "Изберете, в случай, че данните трябва да бъдат свалени в нов слой"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
@@ -1216,7 +1248,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1230,5 +1262,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr ""
 "Преместване на точките, така че аглите между линиите да са 90 или 270 градуса"
@@ -1267,4 +1300,8 @@
 "нежелани резултати при правоъгълни подравнявания.<br>Сменете проекцията за "
 "избягване на това предупреждение.<br>Ще продължите ли?</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+msgid "Selection must consist only of ways and nodes."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
@@ -1280,4 +1317,15 @@
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr "Моля изберете пътища с почти прави ъгли за ортогонализация."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1383,18 +1431,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1419,12 +1467,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Грешка"
@@ -1560,5 +1609,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1768,9 +1817,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "Дублирай {0} точки в {1} точки"
-msgstr[1] "Дублирай {0} точки в {1} точки"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1814,5 +1863,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr ""
@@ -2236,6 +2285,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2316,7 +2365,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
-#, fuzzy
 msgid "<not>"
-msgstr "север"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
@@ -2358,5 +2406,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Търсене на обекти."
@@ -2405,7 +2453,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
-#, fuzzy
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
-msgstr "<b>\"Baker Street\"</b> - ''Baker Street'' в кой да е ключ или име."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
@@ -2543,5 +2590,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Търсене"
@@ -2581,25 +2628,22 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "CS"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
-msgstr "CI"
+msgstr ""
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
-msgstr "RX"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2613,5 +2657,5 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2619,5 +2663,5 @@
 "ключ=стойност."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2641,7 +2685,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
-msgstr "Неочакван знак: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
@@ -2754,9 +2798,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "Добавени {0} обекта"
-msgstr[1] "Добавени {0} обекта"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2806,12 +2850,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "Изтриване \"{0}\" за {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Задаване {0}={1} за {2} {3}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2874,17 +2918,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Режим на изтриване"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Изтриване на {0} път"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Изтриване на {0} отношение"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2965,9 +3009,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "Изтрити {0} обекта"
-msgstr[1] "Изтрити {0} обекта"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -3017,24 +3061,24 @@
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "Undelete {0} primitive"
 msgid_plural "Undelete {0} primitives"
-msgstr[0] "Отмяна изтриването на {0} примитива."
-msgstr[1] "Отмяна изтриването на {0} примитива."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for node {0}"
-msgstr "Разрешаване конфликт на версиите за възел {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for way {0}"
-msgstr "Разрешаване конфликт на версиите за пътища {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Разрешаване на конфликт на версиите за релация {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3291,5 +3335,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3297,5 +3341,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3303,5 +3347,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3309,5 +3353,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3427,19 +3471,19 @@
 msgstr "С"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Примитив с ID = 0 не може да бъде невидим."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "Очаква се ID > 0. Имаме {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "Очакваше се Version > 0. Имаме: {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3448,5 +3492,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3454,5 +3498,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3575,6 +3619,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3584,5 +3628,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3593,7 +3637,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3615,5 +3659,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "фон"
@@ -3759,6 +3803,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3766,37 +3810,38 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "непълен"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "път / магистрала"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "железопътна линия"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "водоеми"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "земеползване"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3805,10 +3850,10 @@
 msgstr[1] "{0} точки"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3817,5 +3862,5 @@
 msgstr[1] "{0} члена"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3852,6 +3897,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Конфликт"
@@ -3862,7 +3907,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-#, fuzzy
-msgid "Authorization Failed"
-msgstr "Връзката се разпадна."
+msgid "Authorisation Failed"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
@@ -4065,5 +4109,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Инициализиране"
@@ -4104,5 +4147,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4113,5 +4156,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Редактиране"
@@ -4182,29 +4225,29 @@
 msgstr "мащаб"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Географската дължина на показалеца на мишката."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The name of the object at the mouse pointer."
 msgstr "Название на обекта сочен от показалеца на мишката."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Географска ширина на показалеца на мишката."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The angle between the previous and the current way segment."
 msgstr "Ъгъл между предишния и текущия сегмент от пътя"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Направлението на създавания линеен сегмент."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 msgid "The length of the new way segment being drawn."
 msgstr "Дължина на новосъздавания линеен сегмент."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4212,9 +4255,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(няма обект)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4375,16 +4418,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Tags({0} конфликти)"
-msgstr[1] "Tags({0} конфликти)"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "{0} pending tag conflict to be resolved"
 msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} чакащи tag конфликти за разрешаване"
-msgstr[1] "{0} чакащи tag конфликти за разрешаване"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
@@ -4439,16 +4482,16 @@
 msgstr "Разрешение на конфликт"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, 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:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "неочаквана стойност на параметъра \"index\". Имаме: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4647,8 +4690,12 @@
 msgstr "Възел"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr "Обедини точките в най-старата от тях."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4674,5 +4721,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional node used by way {1}<br>which is deleted on the "
@@ -4682,9 +4729,5 @@
 "server.<br><br>Do you want to undelete these nodes too?"
 msgstr[0] ""
-"<html>Има {0} допълнителни възли използвани от {1}<br>които са изтрити на "
-"сървъра.<br><br>Желаете ли да възстановим и тези възли също?</html>"
 msgstr[1] ""
-"<html>Има {0} допълнителни възли използвани от {1}<br>които са изтрити на "
-"сървъра.<br><br>Желаете ли да възстановим и тези възли също?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
@@ -4693,5 +4736,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional primitive referred to by relation {1}<br>which is "
@@ -4701,9 +4744,5 @@
 "deleted on the server.<br><br>Do you want to undelete these too?"
 msgstr[0] ""
-"<html>Има {0} допълнителни примитиви използвани от релация {1}<br>които са "
-"изтрити на сървъра.<br><br>Желаете ли да ги възстановим и тях също?</html>"
 msgstr[1] ""
-"<html>Има {0} допълнителни примитиви използвани от релация {1}<br>които са "
-"изтрити на сървъра.<br><br>Желаете ли да ги възстановим и тях също?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
@@ -4804,5 +4843,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr "Не, изход"
@@ -4850,5 +4889,10 @@
 msgstr "Примитив"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -4978,10 +5022,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "няма/никой"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "всички"
@@ -5011,7 +5055,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-#, fuzzy, java-format
+#, java-format
 msgid "Tag collection does not include the selected value ''{0}''."
-msgstr "Избраният път не съдържа избраната точка."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
@@ -5061,7 +5105,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -5071,6 +5115,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5250,10 +5294,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5273,18 +5317,18 @@
 msgstr "Списък промени: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Разрешаване"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr "Отваряне диалог за сливане на избраните обекти от горния списък."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5317,5 +5361,5 @@
 "<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.Click <strong>{0}</strong> to close anyway."
+"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.</"
@@ -5341,5 +5385,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5348,5 +5392,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5426,43 +5470,48 @@
 msgstr "Показване историята на избраните елементи."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Слоеве"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 msgid "Open a list of all loaded layers."
 msgstr "Отваряне списъка с всички заредени слоеве."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Показване/скриване"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr "Активиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr "Активиране на избрания слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr "Обедини този слой с друг слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Повтарящи се линии"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 msgid "Move the selected layer one row up."
 msgstr "Преместване избрания слой един ред нагоре."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Преместване избрания слой един ред надолу."
@@ -5476,6 +5525,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Връзки"
@@ -5485,69 +5534,69 @@
 msgstr "Отваряне списъка с всички релации"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "Връзки: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Редактиране на релацията"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Изтриване на избраната връзка"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Създаване на нова релация"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Текуща селекция"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Отваряне на списък с избрани обекти."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Мащабирай до избрания(те) елемент(и)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Мащабиране по селекцията"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Избр.: Рел.:{0} / Пътища:{1} / Възли:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5555,5 +5604,5 @@
 msgstr "Избор"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5906,8 +5955,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -5979,4 +6026,7 @@
 #. <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 />
@@ -6055,6 +6105,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6096,6 +6147,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6564,152 +6617,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Име"
@@ -7092,5 +7147,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<различни>"
@@ -7145,55 +7200,55 @@
 msgstr "Добавяне на параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Свойства: {0} / Членство: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Параметри / Отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Промяна на връзка"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "Изтриване от връзка"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Изваждане на избраните обекти от релация {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Изтриване на избрания ключ за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "Изтриване на параметри"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Добавяне на нова двойка ключ/стойност за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Редактиране стойността на избрания ключ за всички обекти"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7229,9 +7284,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1093
-#, fuzzy
 msgid "Conflict in data"
 msgid_plural "Conflicts in data"
-msgstr[0] "Конфликт в данните"
-msgstr[1] "Конфликт в данните"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:345
@@ -7523,7 +7577,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
-#, fuzzy
 msgid "Do you really want to apply the new role?"
-msgstr "Наистина ли искате да изтриете слой ''{0}''?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
@@ -7618,9 +7671,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-#, fuzzy, java-format
+#, 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:72
@@ -7640,47 +7692,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Отметки"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../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:187
+#: ../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:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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:212
+#: ../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:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr ""
@@ -7718,7 +7769,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
-#, fuzzy, java-format
+#, java-format
 msgid "The string ''{0}'' is not a valid double value."
-msgstr "параметърът ''{0}'' не е валиден тип на име, имаме: ''{1}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
@@ -7805,18 +7856,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -7827,34 +7878,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../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:111
+#: ../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:147
+#: ../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:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Грешка! Възможно е да липсват маркери (тагове)."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr ""
@@ -7865,7 +7916,9 @@
 #. 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" />
@@ -7874,10 +7927,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Тип"
@@ -7886,5 +7940,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -7896,17 +7950,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "неизвестно"
@@ -8259,5 +8312,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr "Забелязани са конфликти"
@@ -8706,9 +8759,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8718,7 +8771,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -8730,16 +8783,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "Слой / Ниво"
@@ -9152,68 +9205,68 @@
 msgstr[1] "{0} обекта за изтриване:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "GPS точка"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Настройка рисуването на линии"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Use global settings."
 msgstr "Използвай глобалните настройки."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Избор цвят"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "По подразбиране"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Изберете цвят"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr "Маркери от наименувани точки."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Наименувани точки от следа от {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Импорт Аудио"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9223,23 +9276,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave аудио файлове (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Аудио маркери от {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Импорт на изображения"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9249,5 +9302,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9255,5 +9308,5 @@
 msgstr "Название: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9261,5 +9314,5 @@
 msgstr "Описание: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9269,23 +9322,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "Описание"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Дължина: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9294,5 +9347,5 @@
 msgstr[1] "{0} маршрути, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9301,10 +9354,10 @@
 msgstr[1] "{0} точки на интерес"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Преобразувай в слой данни"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9314,43 +9367,43 @@
 "<br>Ако искате да качвате следи, погледнете тук:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Преобразувано от: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "Свали от OSM по дължина на тази следа"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Свали всичко в пределите на:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} метри"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "Максимална област за една заявка:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9361,9 +9414,9 @@
 "Продължаване?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 msgid "No GPX track available in layer to associate audio with."
 msgstr "Няма GPX следа в слоя за да асоциираме звук с нея."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9373,5 +9426,5 @@
 "са пропуснати или преместени в началото."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9381,23 +9434,23 @@
 "смислено да се предположи тяхното време, бяха пропуснати."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Слой Данни {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "извън областта за сваляне"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr "версия {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9406,5 +9459,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9418,5 +9471,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9429,11 +9482,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9442,32 +9495,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} се състои от:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr "неустановена"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr "API версия: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Преобразувай в слой GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9514,28 +9567,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "GPS Точки"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX Файлове (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Файлът {0} е зареден вече под името \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Грешка при разбор {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Не може да се прочете \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9547,34 +9599,34 @@
 "изберете времева зона<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr "Време на снимката (от EXIF):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 msgid "Gps time (read from the above photo): "
 msgstr "Gps време (прочетено от снимката по-горе): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [дд/мм/гггг чч:мм:сс]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr "Намирам се в часовата зона: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "Без дата"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr "Отваряне друга снимка"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Синхронизиране време от снимка на GPS приемник"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9584,64 +9636,64 @@
 "Моля използвайте изисквания формат!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "Невалидна дата"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr "<Няма още GPX следи заредени>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr "GPX следа: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr "Отвори друга GPX следа"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr "Часова зона: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr "Отместване:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9651,45 +9703,45 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr "Съпоставяне на изображения с GPX следа"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr "Корелнутииране"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr "Невалидна часова зона"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr "Невалидно отместване"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Часови пояс: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Минути: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Секунди: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9698,5 +9750,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9704,21 +9756,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr "Съотнасянето на снимки към следа се провали"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr "Настройване часови пояс и отместване"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 msgid "The selected photos do not contain time information."
 msgstr "Избраните снимки не съдържат времева информация."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr "Снимките не съдържат времева информация"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -9726,17 +9778,17 @@
 msgstr "Избраната GPX следа не съдържа времена. Моля изберете друга."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr "GPX следата няма информация за времето"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr "Трябва да изберете GPX следа"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr "Няма избрана GPX следа"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9747,5 +9799,5 @@
 "Очакван формат: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9756,75 +9808,75 @@
 "Очакван формат: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "Извличане на GPS координати от EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr "Започване на преглед на директории"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "Прочитане на снимки..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Четене {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, 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:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Сканиране на директория {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Намерен е празен файл в директория {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Грешка при четене на файлове от директория {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Изображения с данни за местоположение"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr "Корелиране към GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "Никакви данни не са заредени."
-msgstr[1] "Никакви данни не са заредени."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
+#, java-format
 msgid "{0} was found to be GPS tagged."
 msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] "{0} открити с gps тагове."
-msgstr[1] "{0} открити с gps тагове."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -9833,5 +9885,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -9928,5 +9980,5 @@
 msgstr "GPS маркер"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -9934,5 +9986,5 @@
 msgstr[1] "маркери"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -9941,9 +9993,9 @@
 msgstr[1] "{0} се състои от {1} маркери"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "Синхронизиране аудио"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -9952,20 +10004,20 @@
 "синхронизиращ сигнал."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../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:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr "Установи аудио маркер на позицията на прослушване"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -9975,18 +10027,18 @@
 "маркера."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 "Няма съществуващи аудио маркери в този слой, спрямо които да се отмести."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Показване/скирване на Текст/Икони"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Превключване видимостта на маркер текста и икони."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
+#: ../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 "
@@ -9996,5 +10048,5 @@
 "асоцииран звук прослушвате (след първия маркер)."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -10004,5 +10056,5 @@
 "върху точка от следа, където искате да синхронизирате."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "Невъзможно да се създаде нов аудио-маркер."
@@ -10028,19 +10080,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
+#, java-format
 msgid ""
 "Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
 msgstr ""
-"Пропадна зареждането на отметки от ''{0}'' поради причини свързани със "
-"сигурността. Изключение на ОС: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
-#, fuzzy, java-format
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
+#, java-format
 msgid ""
 "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
 msgstr ""
-"Пропадна зареждането на отметки от ''{0}'' поради причини свързани със "
-"сигурността. Изключение на ОС: {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
@@ -10088,7 +10136,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
 msgid "Authorize URL:"
-msgstr "Автор"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10178,7 +10225,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
 msgid "Authorize now"
-msgstr "Автор"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10237,7 +10283,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
-#, fuzzy
 msgid "OAuth authorization failed"
-msgstr "Връзката се разпадна."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
@@ -10317,7 +10362,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
 msgid "Please select an authorization procedure: "
-msgstr "Моля изберете поне четири точки."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10327,7 +10371,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
-#, fuzzy
 msgid "Close the dialog and cancel authorization"
-msgstr "Затваряне на прозореца и продължаване на редактирането с JOSM"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
@@ -10641,5 +10684,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Моля, изберете ред за редактиране"
@@ -10653,5 +10696,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10804,9 +10847,4 @@
 msgstr "Стил на изобразяване {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "Слой: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -10836,6 +10874,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr "Всички"
@@ -10875,8 +10913,8 @@
 msgstr "Единствен цвят (може да се настройва за наименувани слоеве)"
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Автомобил"
@@ -10898,13 +10936,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Вело"
@@ -10937,12 +10975,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "Пеш"
@@ -11298,5 +11336,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
-#, fuzzy
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11312,17 +11349,4 @@
 "keyboard...</p>"
 msgstr ""
-"<p>Може да забележите, че в списъка за избор на клавиши на следващата "
-"страница има всички клавиши, които съществуват по всякакви клавиатури за "
-"които знае Java, а не само тези, които съществуват на вашата клавуатура. "
-"Моля, използвайте само тези стойности, които отговарят на реален клавиш на "
-"вашата клавиатура. Така че ако клавиатурата ви няма 'Copy' клавиш (PC "
-"клавиатурите нямат, Sun клавиатурите имат), то не го използвайте. Също ще "
-"има и 'клавиши' , които отговарят на клавишни комбинации на вашата "
-"клавиатура (примерно ':'/Двуеточие). Моля не ги използвайте и тях, "
-"използвайте базовия клавиш вместо това (';'/Точка и запитая на US "
-"клавиатура, '.'/Точка на Немска клавуатура, ...). Ако не спазвате това, може "
-"да настъпят конфликти, тъй като за  JOSM няма начин да знае, че Ctrl+Shift+; "
-"и Ctrl+: представляват всъщност една и съща комбинация на US клавиатура...</"
-"p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
@@ -11944,5 +11968,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -11950,18 +11981,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "Незадължителни Атрибути:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr "затворен път"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Неизвестен тип: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -11972,16 +12003,16 @@
 msgstr "Не може да се прочете източник на шаблони за маркиране: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Грешка при разбор {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Елементи от тип {0} се поддържат."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -11990,18 +12021,17 @@
 msgstr[1] "Промяна {0} обекта"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "Нищо не е избрано!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "Селекцията е неподходяща!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "Прилагане шаблон"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Промяна параметри"
@@ -12278,6 +12308,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12302,9 +12332,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Грешка при разбор: невалидна структура на gpx документа"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12320,7 +12350,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
-#, fuzzy
 msgid "Looking for image files"
-msgstr "Търсене на бреговата линия..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
@@ -12328,8 +12357,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, fuzzy, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+"Пропадна зареждането на отметки от ''{0}'' поради причини свързани със "
+"сигурността. Изключение на ОС: {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
@@ -12400,5 +12437,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "Координати импортирани: "
@@ -12499,9 +12536,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Промяна {0} обект"
-msgstr[1] "Промяна {0} обекта"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -13130,5 +13167,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -13136,6 +13173,6 @@
 "Plugin {0} requires {1} plugins which were not found. The missing plugins "
 "are:"
-msgstr[0] "Разширение {0} се изисква от разширение {1}, но не беше открито."
-msgstr[1] "Разширение {0} се изисква от разширение {1}, но не беше открито."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13403,5 +13440,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13409,8 +13445,4 @@
 "file a bug report."
 msgstr ""
-"Възникна неочаквана грешка.\n"
-"\n"
-"Това винаги е грешка в кода на програмата. Ако използвате последна версия \n"
-"на JOSM, бъдете така добри да съобщите за проблема."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13505,6 +13537,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -13599,5 +13631,5 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:354
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
@@ -13605,7 +13637,4 @@
 "preferences and your internet connection.</html>"
 msgstr ""
-"<html>Пропадна инициализацията на връзката със сървъра на OSM {0}."
-"<br>Проверете URL на сървъра в настройките, а също и Вашата връзка с "
-"Интернет.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:426
@@ -13623,6 +13652,6 @@
 msgstr "Не е намерен превод за локал {0}. Връщане към {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13631,5 +13660,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -13781,4 +13810,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr "Видимост"
@@ -13869,5 +13899,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "Интерполация на адреси"
@@ -14461,5 +14491,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr "Местоположение"
@@ -14624,21 +14654,21 @@
 "Премахнете областта от връзката преди да я разделите."
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr "файлове на TangoGPS (*.log)"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr "успешно внасяне от TangoGPS"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr "неуспешно внасяне от TangoGPS!"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr "файлове TCX (*.tcx)"
@@ -14670,9 +14700,9 @@
 msgstr "Създаване на копие на път"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr "Слой за редактиране на GPX следи"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Преобразуване към GPX слой с анонимно време"
@@ -14687,13 +14717,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr "Импортиране на път от GPX слой"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr "Височина на съществуващ път"
@@ -14702,6 +14732,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr "Не е открит слой с GPX данни."
@@ -14930,17 +14960,17 @@
 msgstr "Зареждане набор изображения в нов слой."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../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:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr "Началното положение е извън границите на рамката"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../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:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -14984,42 +15014,41 @@
 msgstr "Изтриване на повтарящи се точки..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../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:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr "Възникна непозната грешка"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "изток"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "североизток"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "север"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "северозапад"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "запад"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "югозапад"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "юг"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "югоизток"
@@ -15075,6 +15104,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -15083,73 +15112,73 @@
 msgstr "вода"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "брегова линия"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "земя"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../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:43
+#: ../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:45
+#: ../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:47
+#: ../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:49
+#: ../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:51
+#: ../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:53
+#: ../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:55
+#: ../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:57
+#: ../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:59
+#: ../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:61
+#: ../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:63
+#: ../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:65
+#: ../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:67
+#: ../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:70
+#: ../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:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -15159,5 +15188,5 @@
 "подразбиране 50000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -15167,5 +15196,5 @@
 "Може да бъде 0-255. По подразбиране 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -15176,5 +15205,5 @@
 "подразбиране 0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -15182,58 +15211,58 @@
 "Резолюция на Landsat изображенията, в точки на градус. По подразбиране 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../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:76
+#: ../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:77
+#: ../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:78
+#: ../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:79
+#: ../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:80
+#: ../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:81
+#: ../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:82
+#: ../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:83
+#: ../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:85
+#: ../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:86
+#: ../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:48
+#: ../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:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr "Невъзможно да се получи изображение"
@@ -15257,5 +15286,5 @@
 msgstr "Неуспешна връзка"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr "няма име"
@@ -15286,5 +15315,5 @@
 msgstr "Курс"
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr "LiveGPS слой"
@@ -15360,5 +15389,5 @@
 msgstr "Ъгъл между две избрани точки"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr "Слой за провеждане на измервания"
@@ -15626,4 +15655,76 @@
 msgid "Firefox executable"
 msgstr "изпълним файл на Firefox"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#, fuzzy
+msgid "Read error!"
+msgstr "Резервоар"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Въведете координати за новата точка."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Съхраняване резервни копия"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Грешка"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "Въведенето време не може да бъде използвано."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Невъзможно преименуването на файла ''{0}''"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Съхраняване резервни копия"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "Съхраняване резервни копия"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Презаписване"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+#, fuzzy
+msgid "Could not delete temporary file!"
+msgstr "Не може да бъде открит типа на елемента"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
@@ -15903,6 +16004,6 @@
 msgstr "Запис на данните във файл на всяка минута."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -16029,72 +16130,129 @@
 "предпочитания."
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+#, fuzzy
+msgid "Terrace a house"
+msgstr "Разделяне на сграда"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+msgid "Interpolation"
+msgstr "Интерполация"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Пътна Мрежа"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Най-голям номер"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Най-малък номер"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+#, fuzzy
+msgid "Lowest housenumber of the terraced house"
+msgstr "Обръща номерата на къщите от сграда."
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Създаване на нова релация"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Изриване на дублиращите се пътища"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Име на улица"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr "Най-малък номер"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr "Най-голям номер"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr "Обръщане разделянето на сграда"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr "Обръща номерата на къщите от сграда."
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr "Обръщане разделянето на сграда"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../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:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr "Разделяне на сграда"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr "Създава няколко отделни сгради от една голяма такава."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr "Изберете един затворен път от поне четири възела."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr "Разделяне на сграда"
@@ -16332,5 +16490,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr "Повтарящи се точки"
@@ -16340,5 +16498,5 @@
 msgstr "Този тест проверява за точки, които се намират на едно и също място."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16350,9 +16508,9 @@
 "не виждате) може да ги използват.<br>Наистина ли искате да ги триете?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr "Потвърждение"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr "Възли в една и съща позиция"
@@ -16387,5 +16545,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr "Мултиполигон"
@@ -16540,7 +16698,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr "Неправилна комбинация маркер/стойност"
@@ -16548,80 +16706,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr "Проблем с изобразяването"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Неправилен ключ ''{0}''."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr "Маркери с празни стойности"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr "Неправилен параметров ключ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr "Неправилен интервал в ключ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr "Стойност на параметър започва или завършва с интервал"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr "Стойности съдържащи HTML елементи"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Ключ ''{0}'' не е намерен в шаблони."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr "Шаблоните не съдържат такъв ключ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Стойността ''{0}'' за ключ ''{1}'' не е намерена в шаблоните."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr "Шаблоните не съдържат стойност"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr "ЗА ПОПРАВКА"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr "Проверка на ключовете."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Проверяване за валидни ключове и сравняване със списък от думи."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr "Използване на сложен параметров тест."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr "Проверяване стойностите и маркерите използвайки по-сложни правила."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr "Източници за TagChecker"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16632,87 +16790,87 @@
 "маркирането."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr "Добавяне нов източник в списъка."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr "Редактиране избрания източник."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "Изтриване на източник от списъка"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "Източници на данни"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr "Проверка стойностите."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr "Проверяване дали стойностите са правилни спрямо шаблони."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr "Проверка за маркерни \"ЗА ПОПРАВКА\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 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:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr "Проверка за бележки при рисуване."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr "Проверява дали картата при русиване е открила грешки в данните."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr "Използване на файл с данни по подразбиране."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr "Използване на файла с данни по подразбиране (препоръчвано)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr "Използване на файла за проверка на правопис по подразбиране."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 "Използване на файла за проверка на правопис по подразбиране (препоръчвано)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr "Поправи параметрите"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr "Не може да бъде открит типа на елемента"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr "Не може да бъде открито нивото на предупрежение"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Неправилен израз ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -17156,5 +17314,5 @@
 msgstr "WMS слой ({0}), сваляне в мащаб {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -17169,13 +17327,17 @@
 "WMS въпреки всичко?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr "Да, дръпни изображенията"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr "Невалиден URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+msgid "Download visible tiles"
+msgstr "Сваляне на видимите квадранти"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -17184,50 +17346,46 @@
 "разделителната способност."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
-msgid "Download visible tiles"
-msgstr "Сваляне на видимите квадранти"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "Смяна разделителна способност"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr "Презареждане грешни квадранти"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr "Алфа канал"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "Запис на WMS слоя във файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr "Запис на слоя WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "Зареждане на WMS слой от файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr "Четене на WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Неподдъжана WMS файлова версия; намерена {0}, очаквана {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr "Грешка във формата на файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "Грешка при зареждане на файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -17503,6 +17661,13 @@
 "изображение."
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17513,15 +17678,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Великият JGoodies Plastic Look and Feel."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr "Позволява на други приложения да изпращат команди към JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17530,10 +17695,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr "Предоставя маршрутизиращи възможности."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17544,15 +17709,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Позволява добавянето на маркери/възли на текущата gps позиция."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Предоставя диалог за редактиране на маркери в табличен вид."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17566,10 +17731,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr "Създава терасовидни къщи от един блок."
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17581,5 +17746,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17588,10 +17753,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -17698,6 +17863,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -17705,6 +17879,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "Означение"
@@ -17721,5 +17896,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Брой платна"
@@ -17741,10 +17916,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Макс. скорост (км/ч)"
@@ -17788,14 +17963,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "Еднопосочна"
@@ -17838,13 +18013,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -17882,13 +18057,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Тунел"
@@ -17923,13 +18098,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "Просека"
@@ -17964,13 +18139,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "Насип"
@@ -18102,4 +18277,13 @@
 msgid "Edit Unclassified Road"
 msgstr "Редактиране некласифициран път"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr ""
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -18117,15 +18301,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr "Ширина (метри)"
@@ -18137,5 +18321,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Улица"
@@ -18144,5 +18328,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "Редактиране улица от населено място"
@@ -18160,16 +18344,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Пътна настилка"
@@ -18191,166 +18378,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr "асфалтиран път"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr "неасфалтиран път"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr "асфалт"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr "бетон"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr "метал"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "гора"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr "павета"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr "павиран път"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "чакъл"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr "чакъл"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr "сбито"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr "трева"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "трева"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "пясък"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr "земя"
@@ -18358,5 +18552,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr "Жилищна улица"
@@ -18365,5 +18559,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr "Редактиране жилищна улица"
@@ -18371,5 +18565,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "Пешеходна улица"
@@ -18378,5 +18572,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "Редактирай пешеходна улица"
@@ -18384,5 +18578,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr "Помощна улица"
@@ -18391,5 +18585,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr "Редактиране помощна улица"
@@ -18399,18 +18593,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr "Тип помощна улица"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr "алея"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr "автомобилен"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr "паркинг"
@@ -18418,5 +18612,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr "Улица паркинг"
@@ -18426,5 +18620,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr "Редактиране улица паркинг"
@@ -18432,5 +18626,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "Път (неизвестен тип)"
@@ -18439,5 +18633,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "Редактиране път от неизвестен тип"
@@ -18446,20 +18640,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "Пътни ограничения"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "Редактиране пътни ограничения"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "Пътна такса"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "Без изход"
@@ -18467,9 +18661,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 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"
@@ -18480,6 +18675,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18491,4 +18684,5 @@
 #. 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"
@@ -18507,141 +18701,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "частен"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr "разрешителен"
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr "селскостопански"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "частен"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "с назначение"
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr "разрешителен"
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr "селскостопански"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "не"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr "лек камион (до 3.5т)"
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Камион (над 3.5т)"
@@ -18656,10 +18858,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr "Кон"
@@ -18675,10 +18877,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "Мотоциклет"
@@ -18693,27 +18895,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr "Автомобил"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr "Обществен транспорт"
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr "Моторна лодка"
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "Лодка"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Мин. скорост (км/ч)"
@@ -18721,25 +18915,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "Макс. маса (т)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr "Макс.височина (метри)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr "макс.ширина (метри)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr "макс.дължина (метри)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "Кръгово движение"
@@ -18750,5 +18944,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "Редактиране пътен възел"
@@ -18768,10 +18962,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "автомагистрала"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr "Автомагистрална връзка"
@@ -18793,10 +18987,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "автострада"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr "Автострадна връзка"
@@ -18818,10 +19012,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "главен / първокласен"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr "Връзка с главен път"
@@ -18843,5 +19037,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -18856,9 +19050,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "третокласен"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr "Некласифициран"
@@ -18872,9 +19066,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "улица"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr "Жилищна улица"
@@ -18904,10 +19098,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "служебна"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr "Направлява автобуси"
@@ -18937,5 +19131,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -18947,10 +19141,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Редактирай мост"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr "Редактиране тунел"
@@ -18958,19 +19152,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Пътища"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "Пътен ремонт"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "Редактиране пътен ремонт"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "Пътен възел"
@@ -18986,5 +19180,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "кръгово"
@@ -18992,5 +19186,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr "Черен път"
@@ -18999,40 +19193,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr "Редактирай черен път"
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "Черен път"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "чакъл"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "чакъл"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "чакъл"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "чакъл"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "чакъл"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr ""
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -19040,5 +19228,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -19046,37 +19234,32 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr "туристически маршрут"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "Планинско колоездене"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
-msgstr "Трудна планинска туристическа пътека"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
-msgstr "Алпийска туристическа пътека"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
-msgstr "Трудна алпийска туристическа пътека"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
-msgstr "Екстремна алпийска туристическа пътека"
+msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "Пътека"
@@ -19085,12 +19268,32 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "Редактирай пътека"
 
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr "за средно ниво"
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
+
 #: build/trans_presets.java:489
-#, fuzzy
 msgid "Wheelchairs"
-msgstr "Инвалидна количка"
+msgstr ""
 
 #: build/trans_presets.java:490
@@ -19106,7 +19309,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "Редактиране алея за езда"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -19119,7 +19321,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "Редактиране велоалея"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -19154,24 +19355,21 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "Комбиниране въпреки всичко"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "Редактиране на алея или тротоар"
+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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Редактиране на алея или тротоар"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr "Колелета"
@@ -19179,5 +19377,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "Стъпала"
@@ -19187,5 +19385,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Редактиране на: стълби"
@@ -19193,10 +19391,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr "Пътни точки"
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "Магистрален възел"
@@ -19204,15 +19402,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "Редактирай магистрален възел"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "Номер"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "Услуги"
@@ -19220,5 +19418,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr "Редактирай служба услуги"
@@ -19226,5 +19424,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -19257,17 +19456,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "Оператор"
@@ -19276,5 +19475,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "Светофар"
@@ -19284,5 +19483,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr "Тип пешеходна пътека"
@@ -19291,27 +19490,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr "неконтролирано"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr "светофар"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "остров"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr "немаркиран"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr "Пресичане върху кон"
@@ -19319,6 +19518,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr "Пресичане с велосипед"
@@ -19327,11 +19526,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr "Помощник при пресъчане"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr "Име на типа пътека (UK)"
@@ -19339,30 +19538,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr "зебра"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr "светофар контролиран от пешеходци"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "Стоп"
@@ -19370,5 +19569,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr "Пешеходна пътека"
@@ -19377,14 +19576,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr "Редактиране на пресечно място или кръстовище"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr "Тип име (UK)"
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr "Мини кръгово движение"
@@ -19395,14 +19640,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr "Посока"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr "по часовниковата стрелка"
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr "Обръщало"
@@ -19412,26 +19657,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "Знак указващ начало/край на населено място"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "Редактирай знак за ограничение в град"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr "Второ име"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "Телефон за спешен случай"
@@ -19439,5 +19686,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr "Наклон"
@@ -19445,5 +19692,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr "Стръмен наклон"
@@ -19451,11 +19698,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr "Брод"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr "Редактирай брод"
@@ -19463,5 +19717,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr "Планински проход"
@@ -19469,5 +19723,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr "Редактирай планински проход"
@@ -19479,7 +19733,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "Надморска височина"
@@ -19487,5 +19741,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Прегради"
@@ -19493,5 +19747,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr "Стълб"
@@ -19499,5 +19753,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr "Редактиране на стълб"
@@ -19542,16 +19796,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "Разрешено преминаване:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr "Вело бариера"
@@ -19560,5 +19814,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr "Бетонен блок"
@@ -19566,5 +19820,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr "Тексаска мрежа (препятствие за животни)"
@@ -19572,10 +19826,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr "Редактирай тексаска мрежа"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr "Бус трап"
@@ -19583,15 +19837,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr "Шипове"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr "Редактиране шипове"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "Място за плащане пътна такса"
@@ -19599,5 +19853,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "Редактирай място за плащане пътна такса"
@@ -19605,10 +19859,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr "Граничен контрол"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr "Редактирай граничен контрол"
@@ -19618,5 +19872,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr "Плет"
@@ -19625,12 +19879,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:817 build/trans_presets.java:819
 msgid "Fence"
 msgstr "Ограда / стобор"
 
-#. item "Barriers/Fence"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "Стена"
@@ -19638,5 +19904,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "Градска стена"
@@ -19645,5 +19911,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr "Подпорна стена"
@@ -19655,15 +19921,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr "Вход"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr "Редактирай вход"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "Порта"
@@ -19671,50 +19938,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr "Редактирай порта"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr "Вдигаще се врата"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr "Редактиране на вдигаща се преграда"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr "Врата с бодлива тел"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr "Редактирай врата с бодлива тел"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr "Накланяща преграда (bump gate)"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr "Редактирай накланяща преграда"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr "Кисинг гейт (преграда срещу животни)"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr "Редактирай кисинг гейт"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr "Стълби за преминаване през ограда"
@@ -19722,25 +19989,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr "Редактиране на: стълби за преминаване през ограда"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr "турникет (контрол на достъпа)"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr "редактиране на: турникет"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr "Двойна врата"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr "Редактирай двойна врата"
@@ -19751,11 +20018,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "Вода"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "Извор"
@@ -19763,5 +20030,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "Редактирай извора"
@@ -19769,5 +20036,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr "Отточен канал"
@@ -19775,10 +20042,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr "Редактирай отточен канал"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "Поток"
@@ -19786,10 +20064,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "Редактирай поток"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "Канал"
@@ -19797,10 +20075,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "Редактирай канал"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "Река"
@@ -19810,5 +20088,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "Редактирай река"
@@ -19816,15 +20094,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Редактирай водата"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "Суша"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "Редактирай сушата"
@@ -19832,15 +20110,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr "Басейн"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr "Редактиране на басейн"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr "Резервоар"
@@ -19848,15 +20126,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr "Редактирай резервоар"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr "Закрит резервоар"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr "Редактирай закрит резервоар"
@@ -19864,5 +20142,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "Речен бряг"
@@ -19871,10 +20149,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "Редактирай речен бряг"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr "Мочурище"
@@ -19885,14 +20163,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr "Редактирай мочурището"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "блато"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr "тресавище"
@@ -19906,35 +20184,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr "блато"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr "тръстенак"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr "солени блата / солници"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr "приливно-отливно крайбрежие"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr "мангрова гора"
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "Кал"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr "Редактирай калта"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "Плаж"
@@ -19942,20 +20220,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "Редактирай плажа"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "Залив"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "Редактирай залива"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "Скала"
@@ -19963,10 +20241,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "Редактирай скалата"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "Крайбрежие"
@@ -19974,5 +20252,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "Редактирай крайбрежието"
@@ -19980,5 +20258,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "Ферибот маршрут"
@@ -19986,5 +20264,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr "Ферибот"
@@ -19993,5 +20271,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr "Корабостроителница"
@@ -19999,10 +20277,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr "Редактирай корабостроителница"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "Док"
@@ -20010,5 +20288,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr "Редактирай док"
@@ -20016,5 +20294,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "Язовирна стена"
@@ -20022,15 +20300,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "Редактирай язовирна стена"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr "Хидротехническо съоръжение"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr "Шлюзова врата"
@@ -20039,5 +20317,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr "Бент / преливник"
@@ -20045,20 +20323,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr "Редактирай бент / преливник"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "Водопад"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "Редактирай водопад"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr "Разширение за обръщане"
@@ -20067,15 +20345,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr "Пристанище за яхти"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr "Редактирай пристанище за яхти"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "Кей"
@@ -20083,10 +20361,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "Редактирай кей"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr "Ферибот терминал"
@@ -20094,10 +20372,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr "Редактирай ферибот терминал"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr "Хелинг"
@@ -20107,20 +20385,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr "Редактирай хелинг"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr "Транспорт"
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "Железница"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "ЖП Линия"
@@ -20128,5 +20406,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr "Редактирай ЖП Линия"
@@ -20135,139 +20413,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr "стандартен"
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr "Депо"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr "ЖП стрелка"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr "скоростна"
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr "ЖП"
+
+#. item "Man Made/Power Line" text "Line reference"
+#. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
+#: build/trans_presets.java:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr "Теснолинейка"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr "Редактирай теснолинейка"
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr "Монорелса"
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr "Редактирай монорелса"
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr "Историческа ЖП линия"
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr "Редактирай историческа ЖП линия"
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr "Лека ЖП линия"
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr "Редактирай лека ЖП линия"
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "Метро"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "Редактирай метро"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "Трамвай"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr "Редактирай трамвай"
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr "Направляван автобус"
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr "Редактирай направляван автобус"
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "Неизползвана ЖП линия"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "Редактирай неизползвана ЖП линия"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr "Незадължителни типове"
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr "Депо"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr "ЖП стрелка"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr "скоростна"
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr "Теснолинейка"
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr "Редактирай теснолинейка"
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr "Монорелса"
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr "Редактирай монорелса"
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr "Историческа ЖП линия"
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr "Редактирай историческа ЖП линия"
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr "Лека ЖП линия"
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr "Редактирай лека ЖП линия"
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "Метро"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "Редактирай метро"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "Трамвай"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr "Редактирай трамвай"
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr "Направляван автобус"
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr "Редактирай направляван автобус"
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "Неизползвана ЖП линия"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "Редактирай неизползвана ЖП линия"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "Изоставена ЖП линия"
@@ -20276,5 +20793,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr "Регулиран ЖП прелез"
@@ -20283,5 +20800,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr "ЖП прелез"
@@ -20291,5 +20808,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr "Тип пресичане"
@@ -20297,5 +20814,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "ЖП Обръщаща платформа"
@@ -20304,10 +20821,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr "Надземни линии"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "Седалков лифт"
@@ -20315,10 +20839,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr "Редактирай седалков лифт"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr "Влек"
@@ -20326,10 +20850,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr "Редактирай влек"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "Кабинков лифт"
@@ -20337,10 +20861,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "Редактирай кабинков лифт"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr "Гондола"
@@ -20348,10 +20872,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr "Редактиране на гондола"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20359,12 +20883,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr ""
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "Бензиностанция"
@@ -20374,9 +20911,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Редактирай бензиностанция"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20430,32 +21024,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "Работно време"
@@ -20514,94 +21108,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr "денонощно"
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr "понеделник-петък 08:30-20:00"
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 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:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20613,5 +21283,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20621,5 +21291,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Редактирай паркинг"
@@ -20630,25 +21300,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr "Ref номер"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "на няколко нива"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "наземен"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr "подземен"
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr ""
@@ -20657,48 +21327,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "Такса"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr "Капацитет (общ)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr "Места за инвалиди"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr "Запазени места за жени"
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr "Запазени места за родители"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "Автомивка"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "Редактирай автомивка"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "Сервиз"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "Редактирай автосервиз"
@@ -20706,5 +21376,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "Под наем"
@@ -20713,10 +21383,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "Редактиране коли под наем"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr "Споделяне на автомобили"
@@ -20724,5 +21394,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr "Редактирай споделяне автомобили"
@@ -20730,10 +21400,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "Велосипедна стоянка (паркинг)"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr "Капацитет"
@@ -20742,15 +21412,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "Редактиране велосипеди под наем"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Обществен транспорт"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -20760,5 +21430,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -20766,5 +21436,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr "UIC-Референция"
@@ -20772,5 +21442,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr "Малка ЖП гара"
@@ -20778,5 +21448,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr "Редактирай малка ЖП гара"
@@ -20784,5 +21454,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "Трамвайна спирка"
@@ -20791,5 +21461,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "Редактирай трамвайна спирка"
@@ -20797,5 +21467,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "ЖП платформа"
@@ -20804,5 +21474,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "Редактирай ЖП платформа"
@@ -20814,5 +21484,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr "Референция (коловоз #)"
@@ -20820,10 +21490,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr "Област"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "Вход в метро"
@@ -20832,10 +21502,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "Редактирай вход в метро"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr "Инвалидна количка"
@@ -20844,5 +21514,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "Автогара"
@@ -20851,5 +21521,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "Редактирай автогара"
@@ -20857,5 +21527,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "Автобусна спирка"
@@ -20865,5 +21535,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "Редактирай автобусна спирка"
@@ -20872,25 +21542,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr "Навес"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "Скамейка"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr "Автобусна платформа"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr "Редактирай автобусна платформа"
@@ -20898,5 +21569,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "Такси"
@@ -20904,5 +21575,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "Редактирай стоянка таксита"
@@ -20910,32 +21581,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "Летище"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr "Редактиране летище"
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr "IATA"
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr "ICAO"
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr "Пътуване"
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Настаняване"
@@ -20947,5 +21713,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Хотел"
@@ -20954,15 +21720,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "Редактирай хотел"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "Звезди"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr "Мотел"
@@ -20970,20 +21736,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr "Редактирай мотел"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr "Къща за гости"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr "Редактирай къща за гости"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "Бунгало"
@@ -20991,10 +21757,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr "Редактирай бунгало"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr "Хостел / студентско общежитие"
@@ -21002,30 +21768,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr "Редактирай хостел / студентско общежитие"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr "Планинска хижа"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr "Редактирай планинска хижа"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr "Площадка за каравани"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr "Редактирай площадка за каравани"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "Къмпинг"
@@ -21033,10 +21799,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr "Редактирай къмпинг"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Храна и напитки"
@@ -21047,5 +21813,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ресторант"
@@ -21053,5 +21819,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "Редактирай ресторант"
@@ -21059,5 +21825,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr "Кухня"
@@ -21065,61 +21831,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "италианска"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "китайска"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "пица"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "бургери"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "гръцка"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "немска"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "индийска"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "местна"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr "кебаб"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "турска"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "азиатска"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "тайландска"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "мексиканска"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "японска"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "Заведение за бързо хранене"
@@ -21127,9 +21905,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "Редактирай заведение бързо хранене"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "Кафене"
@@ -21137,9 +21923,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "Редактирай кафене"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "Бар"
@@ -21147,18 +21933,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "Редактирай бар"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr "Бирария"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr "Редактирай бирария"
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr "Бар"
@@ -21166,9 +21952,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr "Редактиране на бар"
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "Нощен клуб"
@@ -21176,24 +21962,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "Редактирай нощен клуб"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Туризъм"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr "Атракция"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr "Редактирай забележилтеност"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Музей"
@@ -21201,9 +21987,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Редактирай музей"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Зоопарк"
@@ -21212,9 +21998,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Редактирай зоопарк"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "Място с добра гледка"
@@ -21222,24 +22008,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "Редактирай място с добра гледка"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr "Наблюдателница"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "Развлекателен парк"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr "Редактирай развлекателен парк"
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "Творба на изкуството"
@@ -21247,5 +22033,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "Редактирай творба на изкуството"
@@ -21253,19 +22039,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr "Информационен пункт"
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Карта"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr ""
@@ -21303,5 +22089,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -21309,28 +22095,28 @@
 msgstr "улица"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr "схема"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr "място"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr "град"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr "район"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr "По-подробно описание"
@@ -21340,5 +22126,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr "Показани са пътища за:"
@@ -21346,5 +22132,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr "Туристическа пътека"
@@ -21352,6 +22138,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "Велосипедизъм"
@@ -21359,5 +22145,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr "Планинско колоездене"
@@ -21365,6 +22151,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "Ски"
@@ -21372,5 +22158,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr "Колоездене"
@@ -21378,46 +22164,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr "... възможни са други способи за придвижване"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr "Информационно табло"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr "Съдържание на таблото"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr "табела"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "история"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr "природа"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr "дива природа"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr "растения"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr "Упътване"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr "Информационен пункт"
@@ -21425,29 +22211,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr "По-точно описание"
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr "Аудио напътствия"
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr "Аудио-напътствия по мобилен телефон?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr "Тел. номер"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr "Други информационни точки"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr "Редактирай навес"
@@ -21455,25 +22241,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr "Огнище"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "Място за пикник"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "Редактирай място за излет"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Исторически места"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Замък"
@@ -21482,19 +22268,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Редактирай замък"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Руини"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Редактирай руини"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Архиологични разкопки"
@@ -21503,9 +22289,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "Редактирай архиологични разкопки"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "Поле на битка"
@@ -21513,10 +22299,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "Редактирай поле на битка"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr ""
@@ -21524,5 +22310,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -21530,15 +22316,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "Забележителност"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "Редактирай забележителност"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "Паметник"
@@ -21546,55 +22332,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "Редактирай паметник"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr "Крайпътен кръст"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr "Редактирай крайпътен кръст"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr "Крайпътен параклис"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr "Редактирай крайпътен параклис"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr "Пограничен камък"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr "редактиране на: Пограничен камък"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Места за отдих и развлечения"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "Редактирай аквапарк"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Площадка"
@@ -21602,35 +22388,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Редактирай площадка"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Риболов"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "Редактирай риболов"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr "Спорт"
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr "Спортни съоражения"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Стадион"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Редактирай стадион"
@@ -21644,6 +22430,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "вид спорт:"
@@ -22035,6 +22821,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -22068,225 +22854,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr "многобой"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "стрелба с лък"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr "атлетика"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "австралийски футбол"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "бейзбол"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "баскетбол"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr "игра с мет.топчета"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr "игра с асим.топки"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr "кану"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "алпинизъм"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr "крикет"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr "крикет мрежи"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr "крокет"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "велоспорт"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr "кучешки надбягвания"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr "конна езда"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "футбол"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "голф"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "гимнастика"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "хокей"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr "конни надбягвания"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr "моторен спорт"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr "бейзбол"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr "ракет бол"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr "ръгби"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "стрелба"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr "скейтборд"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr "фигурно пързаляне"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "ски"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "футбол"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "плуване"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "тенис на маса"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "тенис"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "Спортен център"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "Редактирай спортен център"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr "Игрище"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr "Редактирай игрище"
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr "Състезателна писта"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr "Редактирай състезателна писта"
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "Поле за голф"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "Редактирай поле за голф"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "Миниголф"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "Редактирай миниголф"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Спорт"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr "Многобой"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr "Редактирай многобой"
@@ -22325,21 +23111,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "тип"
@@ -22378,203 +23164,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr "игрище"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "спортен център"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "стадион"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr "следа"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr "Боулинг зала"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr "Редактирай боулинг зала"
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr "Редактирай атлетика"
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "Стрелба с лък"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "Редактирай стрелба с лък"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "Скално катерене"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "Редактирай скално катерене"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr "Кану"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr "Редактирай кану"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr "Редактирай велосипедизъм"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "Надпреварване с кучета"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr "Редактирай надбягвания с кучета"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr "Конна езда"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr "Редактирай конна езда"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr "Конни надбягвания"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr "Редактирай конни надбягвания"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "Гимнастика"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr "Редактирай гимнастика"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "Моторни спортове"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr "Редактирай моторни спортове"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr "Фигурно пързаляне"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr "Редактирай фигурно пързаляне"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr "Скейтборд"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr "Редактирай скейтборд"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "Плуване"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "Редактирай плуване"
@@ -22582,56 +23368,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr "Редактирай ски"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr "Тип писта"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr "спускане"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr "нордическа"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr "Зимен парк"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr "Трудност"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr "начинаещ"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr "лесно"
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr "за средно ниво"
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr "за напреднали"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr "експерт"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr "свободна езда"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "Стрелба"
@@ -22639,182 +23421,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "Редактирай стрелба"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "Спорт (с топка)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "Футбол"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr "Редактирай футбол"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "Американски футбол"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr "Редактирай американски футбол"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr "Австралийски футбол"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr "Редактирай австралийски футбол"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr "Редактирай бейсбол"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "Редактирай баскетбол"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "Голф"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr "Редактирай голф"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "поле за голф"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr "Буле (игра с мет.топчета)"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr "Редактирай Игра с мет.топчета"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr "Игра с асим.мет.топки (bowls)"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr "Редактирай игра с асим.мет.топки"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr "Крикет"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr "Редактирай крикет"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr "Крикет мрежи"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr "Рекдатирай крикет мрежи"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr "Крокет"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr "Редактирай крокет"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "Хокей"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "Редактирай хокей"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr "Пелота"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr "Редактирай пелота"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr "ракет"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr "Редактирай ракет"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "Ръгби"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr "Редактирай ръгби"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "Тенис на маса"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "Редактирай тенис на маса"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "Тенис"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "Редактирай тенис"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr "Изкуствени"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Сгради"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "Сграда"
@@ -22822,5 +23604,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Обществена сграда"
@@ -22828,10 +23610,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Редактирай обществена сграда"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "Кметство"
@@ -22839,10 +23621,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Редактирай кметство"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Посолство"
@@ -22850,10 +23632,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Редактирай посолство"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "Съдебна сграда"
@@ -22862,10 +23644,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Редактирай съдебна сграда"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Затвор"
@@ -22874,10 +23656,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Редактирай затвор"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Полиция/Милиция"
@@ -22887,10 +23669,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Редактирай полиция/милиция"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "Пожарна"
@@ -22899,10 +23681,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Редактирай пожарна"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Пощенска станция"
@@ -22910,5 +23692,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Редактирай пощенска станция"
@@ -22916,15 +23698,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "Детска градина"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "Редактирай детска градина"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "Училище"
@@ -22932,10 +23714,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "Редактирай училището"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "Университет"
@@ -22943,10 +23725,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "Редактирай университет"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "Колеж"
@@ -22954,5 +23736,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "Редактирай колеж"
@@ -22960,5 +23742,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Кино"
@@ -22967,10 +23749,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Редактирай кино"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "Библиотека"
@@ -22979,9 +23761,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Редактирай библиотека"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "Център на изкуствата"
@@ -22989,10 +23771,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "Редактирай център на изкуствата"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Театър"
@@ -23001,10 +23783,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Редактирай театър"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "Място за богослужение"
@@ -23014,5 +23796,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "Редактирай място за богослужение"
@@ -23021,6 +23803,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "Религия"
@@ -23029,66 +23811,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr "Бахаи"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "Будизъм"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "Християнство"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "Индуизъм"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr "Джайнизъм"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "Юдаизъм"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "Мусулманство"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr "Сикхизъм"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr "Спиритуализъм"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr "Даосизъм"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr "Унитаристи"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr "Зороастризъм"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr "Конфесия"
@@ -23097,81 +23879,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr "Англиканска"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "Баптизъм"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "Католическо"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr "Евангелска"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr "Свидетели на Йехова"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "Лютеранство"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr "Методизъм"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr "Мормони"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "Православие"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr "Петдесетници"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr "Пресвитериани"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "Протестантизъм"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr "Кваркери"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr "Шийти"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr "Сунити"
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Адреси"
@@ -23180,5 +23962,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Редактиране на информацията за адреса"
@@ -23186,5 +23968,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "Номер"
@@ -23192,25 +23974,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "Име на дом"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Име на улица"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "Име на град"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Пощенски код"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "Код на държава"
@@ -23219,5 +24001,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "Редактирай интерполация на адреси"
@@ -23225,61 +24007,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr "Схема на номериране"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "нечетни"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "четни"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr "по азбучен ред"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr "Изкуствени"
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "Цех"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "Редактирай цех"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Кула"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Редактирай кула"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr "Тип на кулата"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr "Височина (в метри)"
@@ -23287,25 +24069,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Водонапорна кула"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Редактирай водонапорна кула"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "Газохранилище"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "Редактирай газохранилище"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "Маяк / Светлинен фар"
@@ -23313,10 +24095,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Редактирай маяк / светлинен фар"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Мелница"
@@ -23324,10 +24106,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Редактирай мелница"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Тръбопровод"
@@ -23336,37 +24118,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Редактирай газопровод"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
+msgid "gas"
+msgstr "газ"
+
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr ""
+
+#: build/trans_presets.java:2353
 msgid "oil"
 msgstr "нефт"
 
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-msgid "gas"
-msgstr "газ"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr "отходна тръба"
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr "подводно"
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "Пречиствателна станция"
@@ -23376,10 +24158,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "Редактирай пречиствателна станция"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Кран"
@@ -23387,21 +24169,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Редактирай кран"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr "Маяк / Радиопредавател"
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr "Редактирай маяк / радиопредавател"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "Точка на наблюдение"
@@ -23409,10 +24186,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "Редактирай точка на наблюдение"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "Видеонаблюдение"
@@ -23420,11 +24197,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Редактирай видеонаблюдение"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "Електроцентрала"
@@ -23434,35 +24223,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "Редактирай електрогенератор"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "вятърна енергия"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "водна енергия"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "енергия от изкопаеми горива"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "атомна"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "въглища"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr "слънчева енергия"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "Електростанция"
@@ -23471,10 +24260,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "Редактирай електростанция"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "Електроподстанция"
@@ -23483,5 +24272,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "Редактирай електроподстанция"
@@ -23489,10 +24278,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr "Номер линия"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "Електрически стълб от ЕПМ"
@@ -23503,23 +24292,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "Редактирай стълб от ЕПМ"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr "кула"
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "Линия за електропренос"
@@ -23528,79 +24317,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "Редактирай линия за електропренос"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr "Тип на линия"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr "линия"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr "второстепенна линия"
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "Волтаж"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr "Брой проводници"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr "един"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr "два"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr "три"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr "четири"
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr "Обществени удобства"
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Тоалетни"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr "Забележка"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "Пощенска кутия"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Телефон"
@@ -23609,5 +24393,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Редактирай телефон"
@@ -23615,5 +24399,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Монети"
@@ -23621,5 +24405,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "Банкноти"
@@ -23627,5 +24411,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr "Електрони средства за разплата"
@@ -23633,5 +24417,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr "Дебитни карти"
@@ -23639,15 +24423,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Кредитни карти"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Телефонни карти"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Рециклиране"
@@ -23656,5 +24440,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Редактиране на станция за рециклиране"
@@ -23662,63 +24446,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "Батерии"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "Консервни кутии"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "Дрехи"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "Стъкло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "Хартия"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "Вторични суровини"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+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:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr "Материал"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr "камък"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr "пластмаса"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr "Цвят"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr "черно"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr "кафяво"
@@ -23797,5 +24592,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -23805,31 +24600,31 @@
 msgstr "зеленина"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr "червено"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr "синьо"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr "сиво"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr "бяло"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr "Брой седящи места"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr "Ловно скривалище"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr "Редактирай ловно скривалище"
@@ -23838,30 +24633,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "Височина"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr "нисък"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr "среден"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr "пълен"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr "Скривалище"
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr "Заключване"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "Фонтан"
@@ -23870,10 +24665,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "Редактирай фонтан"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "Питейна вода"
@@ -23882,10 +24677,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Редактирай питейна вода"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr "Дестка ясла"
@@ -23893,15 +24701,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr "Редактирай детска ясла"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Магазини"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr ""
@@ -23909,10 +24717,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "Редактирай автосалон"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr ""
@@ -23921,28 +24729,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "Редактирай вело-магазин"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "Редактирай супермаркет"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr "Аптека"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr "Редактиране на: аптека"
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr "Бакалия"
@@ -23950,9 +24758,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr "Редактирай бакалия"
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "Будка"
@@ -23960,27 +24768,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "Редактирай будка"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr "Книжарница"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr "Редактиране на книжарница"
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr "Туристическа агенция"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr "Редактиране на туристическа агенция"
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "Автомат за стоки"
@@ -23988,5 +24796,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "Редактирай автомат за стоки"
@@ -23994,88 +24802,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "Продукти за автоматична продажба"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr "билети за обществен транспорт"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr "карта на обществен транспорт"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr "билети за паркиране"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "храна"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "напитки"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "сладки"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "цигари"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "фотографии"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "храна за животни"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "вестници"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "играчки"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "пощенски марки"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "SIM-карти"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr "телефонни ваучери"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr "ваучери"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "презервативи"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr "тампони"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr "торби за екскременти"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr "клиентски карти"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "Месарница"
@@ -24083,9 +24891,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Редактирай месарница"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "Фурна"
@@ -24093,9 +24901,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Редактирай фурна"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "Цветарски магазин"
@@ -24103,18 +24911,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "Редактирай цветарски магазин"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr "Био магазин"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr "Редактирай био магазин"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr "Алкохол"
@@ -24122,54 +24930,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr "Редактиране магазин за алкохол"
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr "Напитки"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr "Редактиране магазин за безалкохолни"
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr "Компютри"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "Редактирай компютърен магазин"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr "Електроника"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "Редактирай магазин за електроника"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr "Аудио HiFi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr "Редактирай магазин за Аудио HiFi"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr "Мебелен магазин"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "Редактирай мебелен магазин"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr "Градински център"
@@ -24177,9 +24985,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr "Редактирай градински център"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr "Железария"
@@ -24187,9 +24995,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr "Редактирай железария"
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "Магазин \"Направи си сам\""
@@ -24197,54 +25005,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "Редактирай магазин \"Направи си сам\""
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr "Книжарница"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr "Редактирай книжарница"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "Фризьорски салон / козметика"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "Редактирай фризьорски салон / козметика"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr "Обувки"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "Редактирай магазин за обувки"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr "Играчки"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "Редактирай магазин за играчки"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr "Видео"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr "Редактирай Видео-магазин"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Химическо чистене"
@@ -24252,9 +25060,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Редактирай химическо чистене"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Пералня"
@@ -24262,9 +25070,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Редактирай пералня"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr "Туристически стоки (за активен отдих)"
@@ -24272,28 +25080,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr "Редактирай мазизин за туристически стоки"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr "Редактирай магазин за спортни стоки"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr "Оптика"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "Редактирай оптика"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Пари"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Банка"
@@ -24301,14 +25109,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Редактирай банка"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "Банкомат"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Обмяна на валута"
@@ -24316,5 +25124,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Редактирай обмяна на валута"
@@ -24322,15 +25130,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Редактирай банкомат"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Здраве"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "Доктори"
@@ -24338,18 +25146,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "Редактирай доктори"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "Стоматолог"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "Редактирай стоматолигия"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -24357,5 +25165,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Редактирай аптека"
@@ -24363,9 +25171,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr "Приготвят лекарства по рецепти"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Болница"
@@ -24373,10 +25181,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Редактирай болница"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr "Пункт за връзка със спешна помощ"
@@ -24385,5 +25193,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr "Редактирай пункт за връзка със спешна помощ"
@@ -24392,20 +25200,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr "Номер на пункта"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr "Име на пункта"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "Телефонен номер"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Използвайте международен код, като например +12-345-67890)"
@@ -24413,5 +25221,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "Ветеринар"
@@ -24420,64 +25228,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "Редактирай ветеринар"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr "География"
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Места"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Континент"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Редактирай континент"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "Държава"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Редактирай държава"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "Област/Щат"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "Редактирай област/щат"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "Област"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "Редактирай област"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr "Графство"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr "Редактирай графство"
@@ -24485,15 +25293,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "Град (над 100 000)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "Редактирай голям град"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "Град (под 100 000)"
@@ -24501,10 +25309,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "Редактирай град"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "Квартал/предградие"
@@ -24512,25 +25320,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "Редактирай квартал"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Село"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Редактирай село"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "Махала"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "Редактирай махала"
@@ -24538,5 +25346,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr "Местност"
@@ -24544,10 +25352,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr "Редактирай местност"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "Остров"
@@ -24555,10 +25363,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Редактирай остров"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr "Скала"
@@ -24566,5 +25374,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr "Редактиране на: скала"
@@ -24572,5 +25380,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "Пещерен вход"
@@ -24578,10 +25386,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "Редактиране пещерен вход"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Връх"
@@ -24589,10 +25397,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Редактиране връх"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "Ледник"
@@ -24600,10 +25408,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "Редактиране ледник"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "Вулкан"
@@ -24611,70 +25419,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "Редактиране вулкан"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Граници"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "Национална"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "Редактирай национална граница"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "Административна"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "Редактирай административна граница"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr "Гражданска"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr "Редактирай гражданска граница"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr "Политическа"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "Редактирай политическа граница"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr "Национален парк"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "Редактирай граница национален парк"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Земеползване"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Дърво"
@@ -24683,15 +25491,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Редактирай дърво"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "Ботаническо название"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "Гора"
@@ -24700,5 +25508,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "Редактирай гората"
@@ -24706,17 +25514,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "иглолистен"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "широколистен"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "смесен"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "Гора"
@@ -24725,14 +25533,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "Редактирай гора"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "Природен резерват"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "Редактирай природен резерват"
@@ -24740,25 +25548,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr "Сипей"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr "Редактирай сипей"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr "Шубрак"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr "Редактирай шубрака"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr "Скалист склон"
@@ -24766,10 +25574,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr "Редактирай скалист склон"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr "Пустош"
@@ -24777,5 +25585,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "Редактиране пустош"
@@ -24783,5 +25591,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr "Двор ферма"
@@ -24790,45 +25598,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr "Редактирай двор ферма"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "Обработваема земя"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr "Редактирай обработваема земя"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr "Поляна"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr "Редактиране поляна"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "Лозе"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "Редактирай лозе"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr "Земя за лично ползване"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr "Редактиране на: Земя за лично ползване"
@@ -24836,25 +25644,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "Градина"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "Редактирай градина"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "Трева"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr "Редактирай трева"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr "Зелено село"
@@ -24862,10 +25670,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr "Редактирай зелено селище"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr "Общи"
@@ -24873,20 +25681,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr "Редактирай общи"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "Парк"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "Редактирай парк"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr "Спортна площадка"
@@ -24894,5 +25702,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr "Редактирай спортна площадка"
@@ -24900,15 +25708,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "Жилищна зона"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr "Редактирай жилищна зона"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "Църковно гробище"
@@ -24916,9 +25724,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Редактирай църковно гробище"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "Гробище"
@@ -24926,39 +25734,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "Редактирай гробище"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "Търговия на дребно"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr "Редактирай търговия на дребно"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "Търговия"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr "Редактирай търговия"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "Промишленост"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr "Редактирай промишленост"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr "Железопътен път"
@@ -24966,15 +25774,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr "Редактирай ЖП"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "Военен"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr "Редакирай военна земя"
@@ -24982,50 +25790,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "Строителна площадка"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "Редактирай строителна площадка"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr "Индустриални развалини"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr "Редактирай ундустриални развалини"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr "Зелени площи"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr "Редактирай зелени площи"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr "Сметище"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr "Редактирай сметище"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "Кариера"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "Редактирай кариера"
@@ -25035,5 +25843,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr "Редактиране мултиполигон"
@@ -25042,10 +25850,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr "външен сегмент"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr "вътрешен сегмент"
@@ -25053,5 +25861,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr "Ограничения при завиване"
@@ -25060,5 +25868,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr "Редактиране на ограничения при завиване"
@@ -25066,34 +25874,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr "Ограничения"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr "забранен ляв завой"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr "забранен десен завой"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr "забранено напред"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr "забранен обратен завой"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr "само десен завой"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr "само ляв завой"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr "само направо"
@@ -25102,15 +25910,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr "от път"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr "през точка или път"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr "до път"
@@ -25118,5 +25926,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr "Маршрут"
@@ -25125,5 +25933,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr "Редактиране маршрут"
@@ -25131,5 +25939,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr "Тип маршрут"
@@ -25220,5 +26028,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -25228,17 +26036,17 @@
 msgstr "велосипед"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr "автобус"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr "път"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr "ферибот"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr "ски"
@@ -25298,5 +26106,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -25305,9 +26113,9 @@
 msgstr "пеш"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr "трамваен маршрут"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr "обиколка"
@@ -25321,10 +26129,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr "Описание на символ"
@@ -25332,31 +26140,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr "Мрежа"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr "Състояние на пътя"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr "предложен"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr "алтернативен"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr "временен"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr "връзка"
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr "Цвят (hex)"
@@ -25365,107 +26173,32 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr "сегмент от маршрут"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr "сегмент напред"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr "сегмент назад"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr "точка за спиране"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr "точка за спиране напред"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 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"
@@ -26001,77 +26734,4 @@
 msgid "highway_track"
 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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
-msgstr "ЖП"
 
 #. color rail
@@ -26459,7 +27119,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "Баптизъм"
+msgstr ""
 
 #. color manmade
@@ -29598,115 +30257,4 @@
 msgstr ""
 
-#~ msgid "The plugin could not be removed. Probably it was already disabled"
-#~ msgstr "Добавката не може да бъде премахната. Вероятно е изключена."
-
-#~ msgid "Bridleway"
-#~ msgstr "Алея за езда"
-
-#~ msgid "Cycleway"
-#~ msgstr "Велоалея"
-
-#~ msgid "Footway"
-#~ msgstr "Алея / Тротоар"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Черен път 1-ви клас"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Редактирай черен път 1-ви клас"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Черен път 2-ри клас"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Редактирай черен път 2-ри клас"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Черен път 3-ти клас"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Редактирай черен път 3-ти клас"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Черен път 4-ти клас"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Редактирай черен път 4-ти клас"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Черен път 5-ти клас"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Редактирай черен път 5-ти клас"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Редактиране туристическа пътека"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "Планинска туристическа пътека"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Редактиране планинска туристическа пътека"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Редактиране трудна планинска туристическа пътека"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Редактиране алпийска туристическа пътека"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Редактиране трудна алпийска туристическа пътека"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Редактиране екстремна алпийска туристическа пътека"
-
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "Параметърът ''{0}'' не трябва да е празен"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "Параметърът {0} не трябва да е празен"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "очакваше се OsmDataLayer или GpxLayer. Имаме ''{0}''."
-
-#~ msgid ""
-#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
-#~ "This can lead to nodes being deleted accidentally.\n"
-#~ "Are you really sure to continue?"
-#~ msgstr ""
-#~ "Избрания път(ища) имат възли извън района на свалените данни.\n"
-#~ "Това може да доведе до нежелано изтриване на възли, свързани с други "
-#~ "пътища.\n"
-#~ "Сигурни ли сте че искате да продължите?"
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "Очакваше се ID >= 0. Имаме: {0}."
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "параметърът ''{0}'' е неприемлив клас, имаме: ''{1}''"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "Параметърът 'col' трябва да е 0 или 1. Имаме: {0}"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "Параметърът ''{0}'' не трябва да е празен."
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Конфликт в данните"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "изображение"
-#~ msgstr[1] "изображения"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "Добавката {0} изисква програмата JOSM да бъде обновена до {1}."
-
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -29900,4 +30448,9 @@
 #~ msgstr "GPS Край: {0}"
 
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "изображение"
+#~ msgstr[1] "изображения"
+
 #~ msgid "timezone difference: "
 #~ msgstr "разлика в часови пояси: "
@@ -29989,7 +30542,4 @@
 #~ msgstr "карта на веломаршрути"
 
-#~ msgid "board"
-#~ msgstr "информативна дъска"
-
 #~ msgid "citymap"
 #~ msgstr "карта на града"
@@ -30012,4 +30562,31 @@
 #~ msgid "Portcullis"
 #~ msgstr "Падаща решетка"
+
+#~ msgid "Track Grade 5"
+#~ msgstr "Черен път 5-ти клас"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "Черен път 3-ти клас"
+
+#~ msgid "Track Grade 2"
+#~ msgstr "Черен път 2-ри клас"
+
+#~ msgid "Track Grade 1"
+#~ msgstr "Черен път 1-ви клас"
+
+#~ msgid "Track Grade 4"
+#~ msgstr "Черен път 4-ти клас"
+
+#~ msgid "Cycleway"
+#~ msgstr "Велоалея"
+
+#~ msgid "Bridleway"
+#~ msgstr "Алея за езда"
+
+#~ msgid "Boat"
+#~ msgstr "Лодка"
+
+#~ msgid "Motorboat"
+#~ msgstr "Моторна лодка"
 
 #~ msgid "YAHOO (GNOME)"
@@ -30137,4 +30714,19 @@
 #~ msgstr "Показване на панела автори"
 
+#~ msgid "Edit Demanding Mountain Hiking"
+#~ msgstr "Редактиране трудна планинска туристическа пътека"
+
+#~ msgid "Edit Alpine Hiking"
+#~ msgstr "Редактиране алпийска туристическа пътека"
+
+#~ msgid "Edit Hiking"
+#~ msgstr "Редактиране туристическа пътека"
+
+#~ msgid "Mountain Hiking"
+#~ msgstr "Планинска туристическа пътека"
+
+#~ msgid "Edit Mountain Hiking"
+#~ msgstr "Редактиране планинска туристическа пътека"
+
 #~ msgid "zoom"
 #~ msgstr "мащаб"
@@ -30203,7 +30795,4 @@
 #~ msgid "Synchronize Time with GPS Unit"
 #~ msgstr "Синхронизиране времето с GPS приемника"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Въведенето време не може да бъде използвано."
 
 #~ msgid "The base URL for the OSM server (REST API)"
@@ -30405,7 +30994,4 @@
 #~ msgstr "Само два точки е позволено да бъдат избрани"
 
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Моля изберете пътища с почти прави ъгли за ортогонализация."
-
 #~ msgid "Only one node selected"
 #~ msgstr "Само една точка е избрана"
@@ -30430,7 +31016,4 @@
 #~ msgstr "Избрано така прави вашата следа публичка в openstreetmap.org"
 
-#~ msgid "Public"
-#~ msgstr "Публична"
-
 #~ msgid "Import TCX file as GPS track"
 #~ msgstr "Импортиране на TCX файл като GPS следа"
@@ -30450,4 +31033,14 @@
 #~ msgid "error loading metadata"
 #~ msgstr "грешка при зареждане на метаданните"
+
+#~ msgid ""
+#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
+#~ "This can lead to nodes being deleted accidentally.\n"
+#~ "Are you really sure to continue?"
+#~ msgstr ""
+#~ "Избрания път(ища) имат възли извън района на свалените данни.\n"
+#~ "Това може да доведе до нежелано изтриване на възли, свързани с други "
+#~ "пътища.\n"
+#~ "Сигурни ли сте че искате да продължите?"
 
 #~ msgid "All images"
@@ -30507,6 +31100,6 @@
 #~ msgstr "Проверяване на избранато или всички данни."
 
-#~ msgid "Station"
-#~ msgstr "Гара / Станция / Спирка"
+#~ msgid "Footway"
+#~ msgstr "Алея / Тротоар"
 
 #~ msgid "Remove Selected"
@@ -30600,4 +31193,25 @@
 #~ msgstr "Тип табло"
 
+#~ msgid "Edit Track of grade 1"
+#~ msgstr "Редактирай черен път 1-ви клас"
+
+#~ msgid "Edit Track of grade 2"
+#~ msgstr "Редактирай черен път 2-ри клас"
+
+#~ msgid "Edit Track of grade 3"
+#~ msgstr "Редактирай черен път 3-ти клас"
+
+#~ msgid "Edit Track of grade 4"
+#~ msgstr "Редактирай черен път 4-ти клас"
+
+#~ msgid "Edit Track of grade 5"
+#~ msgstr "Редактирай черен път 5-ти клас"
+
+#~ msgid "Edit Demanding Alpine Hiking"
+#~ msgstr "Редактиране трудна алпийска туристическа пътека"
+
+#~ msgid "Edit Difficult Alpine Hiking"
+#~ msgstr "Редактиране екстремна алпийска туристическа пътека"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Редактирай подвижен мост"
@@ -30605,7 +31219,4 @@
 #~ msgid "Edit Portcullis"
 #~ msgstr "Редактирай падаща решетка"
-
-#~ msgid "Interpolation"
-#~ msgstr "Интерполация"
 
 #~ msgid "Optional"
@@ -30688,4 +31299,7 @@
 #~ msgstr "Невъзможно е да се прочете датата от файла \"{0}\""
 
+#~ msgid "Conflicts in data"
+#~ msgstr "Конфликт в данните"
+
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
@@ -30780,4 +31394,7 @@
 #~ msgstr "параметърът '{0}' не трябва да е празен"
 
+#~ msgid ">"
+#~ msgstr ">"
+
 #~ msgid "History item"
 #~ msgstr "Точка от историята"
@@ -30817,4 +31434,7 @@
 #~ msgstr "Не е намерен примитив с id = {0} и версия = {1} в тази база данни"
 
+#~ msgid "Plugin {0} requires JOSM update to version {1}."
+#~ msgstr "Добавката {0} изисква програмата JOSM да бъде обновена до {1}."
+
 #~ msgid ""
 #~ "Loading of {0} plugin was requested. This plugin is no longer required."
@@ -30829,4 +31449,7 @@
 #~ msgstr[0] "Сваляне на информация за добавките от {0} сайт"
 #~ msgstr[1] "Сваляне на информация за добавките от {0} сайта"
+
+#~ msgid "The plugin could not be removed. Probably it was already disabled"
+#~ msgstr "Добавката не може да бъде премахната. Вероятно е изключена."
 
 #~ msgid "Use a new changeset and close it"
@@ -30896,7 +31519,19 @@
 #~ "<A HREF=\"{1}\">на вашия език</A>."
 
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "Параметърът {0} не трябва да е празен"
+
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr "очакваше се OsmDataLayer или GpxLayer. Имаме ''{0}''."
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "неочаквана върната стойност {0}"
 
+#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "параметъра се очаква да е ''{0}'' > 0 , получено ''{1}''"
+
+#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
+#~ msgstr "параметърът ''{0}'' е неприемлив клас, имаме: ''{1}''"
+
 #~ msgid "There's no primitive with version {0} in this history."
 #~ msgstr "Няма примитив с версия {0} в тази история"
@@ -30911,4 +31546,7 @@
 #~ msgstr "няма намерена последна версия. Историята е празна."
 
+#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
+#~ msgstr "Параметърът 'col' трябва да е 0 или 1. Имаме: {0}"
+
 #~ msgid "Index out of bounds. Got {0}."
 #~ msgstr "индекс извън границите. Имаме: {0}"
@@ -30920,4 +31558,13 @@
 #~ msgstr "Не може да се прочете \"{0}\""
 
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "Параметърът ''{0}'' не трябва да е празен"
+
+#~ msgid "Expected ID >= 0. Got {0}."
+#~ msgstr "Очакваше се ID >= 0. Имаме: {0}."
+
+#~ msgid "Parameter ''{0}'' must not be empty."
+#~ msgstr "Параметърът ''{0}'' не трябва да е празен."
+
 #~ msgid "Replace"
 #~ msgstr "Замяна"
Index: applications/editors/josm/i18n/po/cs.po
===================================================================
--- applications/editors/josm/i18n/po/cs.po	(revision 19689)
+++ applications/editors/josm/i18n/po/cs.po	(revision 19698)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-19 00:01-0500\n"
-"PO-Revision-Date: 2010-01-14 19:02-0500\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-27 08:58+0000\n"
+"Last-Translator: hanoj <ehanoj@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\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-01-13 18:25+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:32+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -70,11 +70,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -242,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -254,13 +254,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -269,5 +269,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -293,5 +296,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Sloučit"
@@ -322,5 +325,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -387,9 +390,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -397,5 +400,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "OK"
@@ -446,6 +451,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -463,5 +468,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -470,11 +475,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -511,5 +516,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "konflikt"
@@ -521,9 +526,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37
 msgid "previous"
-msgstr ""
+msgstr "předchozí"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38
 msgid "next"
-msgstr ""
+msgstr "následující"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
@@ -642,14 +647,14 @@
 msgstr "Prosím zvolte minimálně dvě cesty ke spojení"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Vybrat označené objekty pro vložení."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Prosím zvol něco ke kopírování"
@@ -681,8 +686,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -691,5 +696,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -737,5 +742,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:44
 msgid "Download parent ways/relations..."
-msgstr ""
+msgstr "Stáhnout rodičovské cesty/relace"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:43
@@ -746,18 +751,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Došlo k  {0} konfliktům během importu."
-msgstr[1] "Došlo k  {0} konfliktům během importu."
-msgstr[2] "Došlo k  {0} konfliktům během importu."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "Konflikty během stahování"
-msgstr[1] "Konflikty během stahování"
-msgstr[2] "Konflikty během stahování"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -778,4 +780,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -785,4 +789,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplikovat výběr kopírováním a vložením."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Zduplikovat cestu"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "Upravit vybranou relaci"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "Vrstva: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "Zvětšit na {0}"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr ""
 
 #. <button label="Info" hotkey="I">
@@ -873,11 +905,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 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] "Označená cesta neobsahuje vybraný uzel."
-msgstr[1] "Označené cesty neobsahují vybraný uzel."
-msgstr[2] "Označené cesty neobsahují vybrané uzly."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -998,5 +1028,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "URL"
@@ -1148,5 +1178,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+#, fuzzy
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr "<html>Nelze otevřít adresář.<br>Prosím vyberte soubor!"
 
@@ -1160,10 +1191,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Otevírám {0} souborů..."
-msgstr[1] "Otevírám {0} souborů..."
-msgstr[2] "Otevírám {0} souborů..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1186,7 +1216,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
-#, fuzzy
 msgid "Select if the data should be downloaded into a new layer"
-msgstr "Vyberte pokud chcete data stáhnout do nové vrstvy"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
@@ -1220,7 +1249,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1234,5 +1263,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "Posunout uzly tak, že všechny úhly jsou 90 nebo 270 stupňů"
 
@@ -1244,9 +1274,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:78
 msgid "Undo orthogonalization for certain nodes"
-msgstr ""
+msgstr "Vrátit zpět výsledek ortogonalizace pro dané nody"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:99
 msgid "Orthogonalize / Undo"
-msgstr ""
+msgstr "Pravoúhlost / Zpět"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:106
@@ -1270,4 +1300,9 @@
 "výsledkům pravoúhlého zarovnání.<br>Změňte svůj typ projekce aby zmizelo "
 "toto varování.<br>Vážně chcete pokračovat?</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+#, fuzzy
+msgid "Selection must consist only of ways and nodes."
+msgstr "Multipolygon se musí skládat pouze z uzavřených cest."
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
@@ -1283,4 +1318,15 @@
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "Vybrané prvny nelze uspořádat do pravých úhlů"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr "Vyberte cesty s téměř pravými úhly pro ortogonalizaci."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1297,9 +1343,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151
 msgid "Delete incomplete members?"
-msgstr ""
+msgstr "Smazat nekompletní členy?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152
 msgid "Paste without incomplete members"
-msgstr ""
+msgstr "Vložte bez nekompletích členů"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
@@ -1341,5 +1387,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Open a preferences dialog for global settings."
-msgstr ""
+msgstr "Otevře dialog globální konfigurace."
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
@@ -1388,18 +1434,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1424,12 +1470,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Chyba"
@@ -1565,5 +1612,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1772,10 +1819,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "Duplikovat uzly {0} do {1} uzlů"
-msgstr[1] "Duplikovat uzly {0} do {1} uzlů"
-msgstr[2] "Duplikovat uzly {0} do {1} uzlů"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1819,5 +1865,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr "Stahuji data"
@@ -2244,6 +2290,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2326,7 +2372,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
-#, fuzzy
 msgid "<not>"
-msgstr "sever"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
@@ -2339,7 +2384,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
-#, fuzzy
 msgid "<right parent>"
-msgstr "Chybí pravá závorka"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
@@ -2369,5 +2413,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Hledat objekty."
@@ -2511,5 +2555,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138
 msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>incomplete</b> - všechny nekompletní objekty"
+msgstr "<b>nekompletní</b> - všechny nekompletní objekty"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139
@@ -2556,5 +2600,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Hledat"
@@ -2594,25 +2638,22 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "CS"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
-msgstr "CI"
+msgstr ""
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
-msgstr "RX"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2625,9 +2666,9 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2649,7 +2690,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
-msgstr "Neočekávaný token: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
@@ -2763,10 +2804,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "Přidáno {0} objektů"
-msgstr[1] "Přidáno {0} objektů"
-msgstr[2] "Přidáno {0} objektů"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2816,12 +2856,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "Odstraněno \"{0}\" pro {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Nastaveno {0}={1} pro {2} {3}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2881,17 +2921,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Režim mazání"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Smazat {0} cestu"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Smazat {0} relaci"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2977,10 +3017,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "Odstraněno {0} objektů"
-msgstr[1] "Odstraněno {0} objektů"
-msgstr[2] "Odstraněno {0} objektů"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -3031,25 +3070,24 @@
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "Undelete {0} primitive"
 msgid_plural "Undelete {0} primitives"
-msgstr[0] "Obnovit {0} prvků"
-msgstr[1] "Obnovit {0} prvků"
-msgstr[2] "Obnovit {0} prvků"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for node {0}"
-msgstr "Vyřešení konfliktu verzí uzlu {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for way {0}"
-msgstr "Vyřešení konfliktu verzí cesty {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Vyřešení konfliktu verzí relace {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3160,11 +3198,9 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
 "not a directory.</html>"
 msgstr ""
-"Varování: Nepodařilo se načíst konfiguraci. Nastavená cesta ''{0}'' není "
-"adresářem."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
@@ -3281,5 +3317,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:140
 msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr ""
+msgstr "Varování: soubor revizí ''/REVISION'' chybí."
 
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:76
@@ -3303,5 +3339,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3309,5 +3345,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3315,5 +3351,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3321,5 +3357,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3386,29 +3422,25 @@
 #. column header: hide filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
-#, fuzzy
 msgctxt "filter"
 msgid "H"
-msgstr "H"
+msgstr ""
 
 #. column header: filter text
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
-#, fuzzy
 msgctxt "filter"
 msgid "Text"
-msgstr "Text"
+msgstr ""
 
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "CS"
+msgstr ""
 
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
-#, fuzzy
 msgctxt "filter"
 msgid "I"
-msgstr "I"
+msgstr ""
 
 #. column header: filter mode
@@ -3421,8 +3453,7 @@
 #. filter mode: replace
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210
-#, fuzzy
 msgctxt "filter"
 msgid "R"
-msgstr "RX"
+msgstr ""
 
 #. filter mode: add
@@ -3444,19 +3475,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "objekt s id=0 nemůže být neviditelný"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "očekáváno id > 0. Nalezeno {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "očekávána verze > 0. Nalezena {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3465,5 +3496,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3471,5 +3502,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3592,6 +3623,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3602,5 +3633,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3612,7 +3643,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3635,5 +3666,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "pozadí"
@@ -3777,6 +3808,6 @@
 msgstr "Neptat se příště (zapamatovat si volbu)"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3784,37 +3815,38 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "nekompletní"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "silnice"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "železnice"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "vodní tok"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "využití oblasti (landuse)"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3824,10 +3856,10 @@
 msgstr[2] "{0} uzlů"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3837,5 +3869,5 @@
 msgstr[2] "{0} prvků"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3872,6 +3904,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Konflikt"
@@ -3882,7 +3914,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-#, fuzzy
-msgid "Authorization Failed"
-msgstr "Spojení selhalo."
+msgid "Authorisation Failed"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
@@ -4085,5 +4116,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Inicializace"
@@ -4124,5 +4154,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4133,5 +4163,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Upravit"
@@ -4202,29 +4232,29 @@
 msgstr "měřítko"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 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:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 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:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 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:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 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:104
+msgid "The (compass) heading of the line segment being drawn."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
-msgid "The (compass) heading of the line segment being drawn."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
 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:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4232,9 +4262,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(žádný objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4401,18 +4431,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Značky({0} konfliktů)"
-msgstr[1] "Značky({0} konfliktů)"
-msgstr[2] "Značky({0} konfliktů)"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "{0} pending tag conflict to be resolved"
 msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "Zbývá {0} konfliktů značek k vyřešení"
-msgstr[1] "Zbývá {0} konfliktů značek k vyřešení"
-msgstr[2] "Zbývá {0} konfliktů značek k vyřešení"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
@@ -4467,16 +4495,16 @@
 msgstr "Řešení konfliktů"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "neočekávaná hodnota parametru \"index\". Zadáno {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4688,7 +4716,12 @@
 msgstr "Bod"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr "sloučené body nejsou dosud zmražené. Nelze vytvořit příkaz pro řešení"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4714,5 +4747,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional node used by way {1}<br>which is deleted on the "
@@ -4722,12 +4755,5 @@
 "server.<br><br>Do you want to undelete these nodes too?"
 msgstr[0] ""
-"<html>Je zde dalších {0} bodů použitých v cestě {1}<br>které byly smazány na "
-"serveru.<br><br>Chcete obnovit také tyto body?</html>"
 msgstr[1] ""
-"<html>Je zde dalších {0} bodů použitých v cestě {1}<br>které byly smazány na "
-"serveru.<br><br>Chcete obnovit také tyto body?</html>"
-msgstr[2] ""
-"<html>Je zde dalších {0} bodů použitých v cestě {1}<br>které byly smazány na "
-"serveru.<br><br>Chcete obnovit také tyto body?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
@@ -4736,5 +4762,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional primitive referred to by relation {1}<br>which is "
@@ -4744,12 +4770,5 @@
 "deleted on the server.<br><br>Do you want to undelete these too?"
 msgstr[0] ""
-"<html>Je zde dalších {0} prvků na něž odkazuje relace {1}<br>a jsou smazány "
-"na serveru.<br><br>Chcete je obnovit také?</html>"
 msgstr[1] ""
-"<html>Je zde dalších {0} prvků na něž odkazuje relace {1}<br>a jsou smazány "
-"na serveru.<br><br>Chcete je obnovit také?</html>"
-msgstr[2] ""
-"<html>Je zde dalších {0} prvků na něž odkazuje relace {1}<br>a jsou smazány "
-"na serveru.<br><br>Chcete je obnovit také?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
@@ -4852,5 +4871,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr "Ne, zrušit"
@@ -4898,5 +4917,10 @@
 msgstr "Prvek"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr "sloučené body nejsou dosud zmražené. Nelze vytvořit příkaz pro řešení"
@@ -5026,10 +5050,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "nic"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "všechny"
@@ -5110,7 +5134,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -5121,6 +5145,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5303,10 +5327,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5326,13 +5350,13 @@
 msgstr "Zásobník příkazů: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr "Vyřešit konflikty."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Vyřešit"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
@@ -5340,6 +5364,6 @@
 "seznamu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5372,5 +5396,5 @@
 "<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.Click <strong>{0}</strong> to close anyway."
+"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.</"
@@ -5396,5 +5420,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5403,5 +5427,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5481,43 +5505,48 @@
 msgstr "Zobrazit historii vybraných objektů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 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:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Zobrazit/Skrýt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr "Aktivovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr "Aktivovat vybranou vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr "Sloučit tuto vrstvu do jiné vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Zduplikovat cestu"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 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:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Přesunout zvolenou vrstvu o řádek dolů."
@@ -5531,6 +5560,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Relace"
@@ -5540,69 +5569,69 @@
 msgstr "Otevřít seznam všech relací"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relace: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Otevřít editor pro zvolenou relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Smazat vybrané relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Vytvořit novou relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Vytvořit kopii relace a otevřít ji v novém okně"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr "Nastavit aktuální výběr na seznam vybraných relací"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr "Vybrat členy všech vybraných relací"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr "Vybrat členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr "Stáhnout všechny členy vybraných relací"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr "Stáhnout členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Současný výběr"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Otevřít okno s výběrem."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Přiblížit na zvolené prvky"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Přiblížit na výběr"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Výběr: Rel.:{0} / Cest:{1} / Uzlů:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5610,5 +5639,5 @@
 msgstr "Výběr"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5870,5 +5899,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:324
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:386
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>The selected object is not available in the current<br>edit layer "
@@ -5878,12 +5907,5 @@
 "''{0}''.</html>"
 msgstr[0] ""
-"<html>Žádný z objektů sady změn {0} není dostupný v aktuálně<br>editované "
-"vrstvě ''{1}''.</html>"
 msgstr[1] ""
-"<html>Žádný z objektů sady změn {0} není dostupný v aktuálně<br>editované "
-"vrstvě ''{1}''.</html>"
-msgstr[2] ""
-"<html>Žádný z objektů sady změn {0} není dostupný v aktuálně<br>editované "
-"vrstvě ''{1}''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331
@@ -5973,8 +5995,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -6046,4 +6066,7 @@
 #. <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 />
@@ -6122,6 +6145,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6163,6 +6187,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6631,152 +6657,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Název"
@@ -6845,5 +6873,5 @@
 #, java-format
 msgid "{0} [incomplete]"
-msgstr ""
+msgstr "{0} [nekompletní]"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41
@@ -7003,9 +7031,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
-#, fuzzy
 msgid ""
 "Cannot restrict the changeset query to a specific bounding box. The input is "
 "invalid."
-msgstr "Vybrat pouze sady změn odpovídající specifické oblasti mapy"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
@@ -7021,17 +7048,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
-#, fuzzy
 msgid ""
 "The current value is not a valid user ID. Please enter an integer value > 0"
 msgstr ""
-"Aktuální hodnota nemůže být ID sady změn. Zadejte prosím celé číslo > 0"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
-#, fuzzy
 msgid ""
 "<html>The  current value is not a valid user name.<br>Please enter an non-"
 "empty user name.</html>"
 msgstr ""
-"Aktuální hodnota nemůže být ID sady změn. Zadejte prosím celé číslo > 0"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
@@ -7169,5 +7192,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<různé>"
@@ -7224,55 +7247,55 @@
 msgstr "Přidat vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Vlastnosti: {0} / Členství: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Vlastnosti / Členství"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Změnit relaci"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "Odstranit z relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Opravdu smazat výběr z relace {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Smaže zvolený klíč ve všech objektech"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "Smazat vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Přidat nový pár klíč/hodnota ke všem objektům"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Změnit hodnotu zvoleného klíče pro všechny objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7308,10 +7331,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1093
-#, fuzzy
 msgid "Conflict in data"
 msgid_plural "Conflicts in data"
-msgstr[0] "Konflikt v datech"
-msgstr[1] "Konflikt v datech"
-msgstr[2] "Konflikt v datech"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:345
@@ -7346,6 +7367,7 @@
 msgid "Downloading {0} incomplete child of relation ''{1}''"
 msgid_plural "Downloading {0} incomplete children of relation ''{1}''"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Stahuji {0} nekompletního potomka relace ''{1}''"
+msgstr[1] "Stahuji {0} nekompletní potomky relace ''{1}''"
+msgstr[2] "Stahuji {0} nekompletních potomků relace ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
@@ -7580,5 +7602,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217
 msgid "Download all incomplete members"
-msgstr ""
+msgstr "Stáhnout všechny nekompletní členy"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
@@ -7594,5 +7616,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252
 msgid "Download selected incomplete members"
-msgstr ""
+msgstr "Stáhnout vybrané nekompletní členy"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1291
@@ -7610,5 +7632,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
@@ -7617,7 +7638,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
-#, fuzzy
 msgid "Do you really want to apply the new role?"
-msgstr "Opravdu chcete smazat vrstvu ''{0}''?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
@@ -7712,8 +7732,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr "Varovaní: ignoruji výjimku protože úloha byla přerušena. Výjimka: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
@@ -7733,28 +7753,30 @@
 msgstr "cesta není připojena na předchozího ani následujícího člena relace"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Záložky"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+#, fuzzy
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
+"<html><strong>Vybraná oblast ke stažení</strong> (minšířka,mindélka, "
+"maxšířka, maxdélka): {0}, {1}, {2}, {3}</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr "Vytvořit záložku"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:185
 msgid "Add a bookmark for the currently selected download area"
 msgstr "Přidat záložku pro aktuální výběr stahované oblasti"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:192
 msgid ""
 "Currently, there is no download area selected. Please select an area first."
@@ -7762,19 +7784,19 @@
 "Aktuálně nemáte vybránu oblast pro stažení. Nejdříve prosím nějakou vyberte."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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 "Zadejte prosím název záložky stahované oblasti."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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 "Jméno lokace"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:217
 msgid "Remove the currently selected bookmarks"
 msgstr "Odstranit vybrané záložky"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr "Přejmenovat vybranou záložku"
@@ -7810,7 +7832,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
-#, fuzzy, java-format
+#, java-format
 msgid "The string ''{0}'' is not a valid double value."
-msgstr "Vrstva ''{0}'' není uložená v souboru"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
@@ -7897,18 +7919,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr "Hranice"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr "Blízko"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -7919,34 +7941,34 @@
 msgstr "Vybrat server pro vyhledávání:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
 msgid "Enter a place name to search for:"
 msgstr "Zadej jméno místa které chceš najít:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:112
 msgid "Enter a place name to search for"
 msgstr "Zadejte název hledaného místa"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:148
 msgid "Areas around places"
 msgstr "Oblasti v okolí míst"
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Výjimka desetinné čárky, pravděpodobně nějaké chybějící tagy."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr "Hledat ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr "Klikněte pro zahájení hledání míst"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr "Dotazuji se jmeného serveru"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr "Dotazuji se jmeného serveru ..."
@@ -7957,7 +7979,9 @@
 #. 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" />
@@ -7966,10 +7990,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Typ"
@@ -7978,5 +8003,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -7988,17 +8013,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "neznámý"
@@ -8367,5 +8391,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr "Objeveny konflikty"
@@ -8740,5 +8764,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
@@ -8792,5 +8815,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -8800,12 +8823,5 @@
 "cancelled or have failed.</html>"
 msgstr[0] ""
-"<html>Nahrávání a/nebo ukládání některé z vrstev s úpravami<br>bylo zrušeno "
-"nebo selhalo.</html>"
 msgstr[1] ""
-"<html>Nahrávání a/nebo ukládání některé z vrstev s úpravami<br>bylo zrušeno "
-"nebo selhalo.</html>"
-msgstr[2] ""
-"<html>Nahrávání a/nebo ukládání některé z vrstev s úpravami<br>bylo zrušeno "
-"nebo selhalo.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500
@@ -8828,9 +8844,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8840,7 +8856,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -8852,16 +8868,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "Vrstva"
@@ -9010,5 +9026,9 @@
 "Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong>"
 msgstr[0] ""
+"Nahrávám <strong>{0} objekt</strong> do <strong>1 sady změn</strong>"
 msgstr[1] ""
+"Nahrávám <strong>{0} objekty</strong> do <strong>1 sady změn</strong>"
+msgstr[2] ""
+"Nahrávám <strong>{0} objektů</strong> do <strong>1 sady změn</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86
@@ -9021,5 +9041,12 @@
 "<strong>1 request</strong>"
 msgstr[0] ""
+"Nahrávám <strong>{0} objekt</strong> do <strong>1 sady změn</strong> za "
+"použití <strong>1 požadavku</strong>"
 msgstr[1] ""
+"Nahrávám <strong>{0} objekty</strong> do <strong>1 sady změn</strong> za "
+"použití <strong>1 požadavku</strong>"
+msgstr[2] ""
+"Nahrávám <strong>{0} objektů</strong> do <strong>1 sady změn</strong> za "
+"použití <strong>1 požadavku</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91
@@ -9029,4 +9056,6 @@
 "<strong>{1} requests</strong>"
 msgstr ""
+"Nahrávám <strong>{0} objektů</strong> do <strong>1 sady změn</strong> za "
+"použití <strong>{1} požadavků</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:93
@@ -9049,4 +9078,6 @@
 "strong> using <strong>{1} requests</strong>"
 msgstr ""
+"Nahrávám <strong>{0} objektů</strong> do <strong>několika sad změn</strong> "
+"za použití <strong>{1} požadavků</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66
@@ -9283,68 +9314,68 @@
 msgstr[2] "{0} smazaných objektů:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "gps bod"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Přizpůsobit kreslení linií"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../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:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Přizpůsobit barvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Výchozí"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Zvolit barvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr "Značky z pojmenovaných bodů"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Pojmenované body z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Importovat zvuk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9354,23 +9385,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audiosoubory (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Audio značky z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Importovat obrázky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9380,5 +9411,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9386,5 +9417,5 @@
 msgstr "Jméno: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9392,5 +9423,5 @@
 msgstr "Popis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9400,23 +9431,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "Popis"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr "Časový interval"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr "Délka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Délka: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9426,5 +9457,5 @@
 msgstr[2] "{0} trasy, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9434,10 +9465,10 @@
 msgstr[2] "{0} značek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Převést do datové vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9447,43 +9478,43 @@
 "<br>Pokud chcete nahrát trasy, podívejte se tady:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Převedeno z: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "Stáhnout data z OSM podél této trasy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Stáhnout vše v rozmezí:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metrů"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "Maximální plocha na požadavek:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} čtverečních km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9494,9 +9525,9 @@
 "pokračovat?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 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:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9504,5 +9535,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9512,23 +9543,23 @@
 "byly vynechány."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datová vrstva {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "mimo stažený areál"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr "verze {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 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:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9538,5 +9569,5 @@
 msgstr[2] "Bylo nalezeno {0} konfliktů."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9557,5 +9588,5 @@
 "objektů<br>z lokální datové sady protože byly vymazány na serveru."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9575,11 +9606,11 @@
 "vyřešte je manuálně."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 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:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9589,32 +9620,32 @@
 msgstr[2] "{0} smazáno"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} se skládá z:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr "nenastaveno"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr "Verze API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Převédst do GPX vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9665,28 +9696,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "GPS body"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Soubory GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, 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:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Chyba při parsování {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Nemůžu číst \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9698,34 +9728,34 @@
 "pásmo<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr "Čas fotografie (z exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 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:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/rrrr hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr "Jsem v časovém pásmu: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "Žádné datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr "Otevřít další fotografie"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 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:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9735,64 +9765,64 @@
 "Prosíme, použijte požadvaný formát"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "Neplatné datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr "<Není nahraná GPX trasa>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr "GPX trasa: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr "Otevřít jinou GPX trasu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr "Časové pásmo: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr "Posun:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9801,47 +9831,46 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr "Korelovat obrázky s GPX trasou"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr "Korelovat"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr "Nepatné časové pásmo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr "Neplatný posun"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Časová zóna: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuty: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekundy: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9850,5 +9879,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9856,21 +9885,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr "Dosazení fotografií do trasy selhalo."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr "Upravit časovou zónu a posun"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 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:951
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr "Fotografie neobsahují informace o čase"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -9878,17 +9907,17 @@
 msgstr "Zvolená GPX trasa neobsahuje časové údaje. Zvolte, prosím, jinou."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr "GPX trasa neobsahuje časové údaje"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr "Měli byste vybrat GPX trasu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr "Není vybrána GPX trasa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9899,5 +9928,5 @@
 "Očekávaný formát: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9908,77 +9937,75 @@
 "Očekávaný formát: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extrahovat pozice GPS z EXIFu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr "Začínam prohledávat adresář"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "Načíst fotografie..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Čtu {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, 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:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Prohledávám adresář {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, 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:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, 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:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Obrázky s GPS souřadnicemi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr "Korelovat vůči GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "Nebyla načtena žádná data."
-msgstr[1] "Nebyla načtena žádná data."
-msgstr[2] "Nebyla načtena žádná data."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
+#, java-format
 msgid "{0} was found to be GPS tagged."
 msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] "Bylo nalezeno {0} fotografií s GPS tagem."
-msgstr[1] "Bylo nalezeno {0} fotografií s GPS tagem."
-msgstr[2] "Bylo nalezeno {0} fotografií s GPS tagem."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -9987,5 +10014,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10082,5 +10109,5 @@
 msgstr "gps značka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10089,5 +10116,5 @@
 msgstr[2] "značky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10097,9 +10124,9 @@
 msgstr[2] "{0} se skládá z  {1} značek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "Synchronizovat audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10107,20 +10134,20 @@
 "Audio je třeba pozastavit v okamžiku, kdy uslyšíte synchronizační impuls."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr "Zvuk zesynchronizován na bodu {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -10128,17 +10155,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Zobrazit/Skrýt Text/Ikony"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 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:171
+#: ../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 "
@@ -10146,5 +10173,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -10152,5 +10179,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "Není možné vztvořit novou zvukovou značku"
@@ -10176,19 +10203,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
+#, java-format
 msgid ""
 "Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
 msgstr ""
-"Z bezpečnostních důvodů se nepodařilo se načíst záložky z  ''{0}''. Výjimka: "
-"{1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
-#, fuzzy, java-format
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
+#, java-format
 msgid ""
 "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
 msgstr ""
-"Z bezpečnostních důvodů se nepodařilo se načíst záložky z  ''{0}''. Výjimka: "
-"{1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
@@ -10236,7 +10259,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
 msgid "Authorize URL:"
-msgstr "Autor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10326,7 +10348,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
 msgid "Authorize now"
-msgstr "Autor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10354,5 +10375,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
 msgid "Please enter your OSM user name"
-msgstr ""
+msgstr "Prosím zadejte své uživatelské jméno pro OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:411
@@ -10365,5 +10386,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
 msgid "Please enter your OSM password"
-msgstr ""
+msgstr "Prosím zadejte své heslo pro OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:432
@@ -10385,7 +10406,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
-#, fuzzy
 msgid "OAuth authorization failed"
-msgstr "Spojení selhalo."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
@@ -10465,7 +10485,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
 msgid "Please select an authorization procedure: "
-msgstr "Vyberte minimálně 4 uzly"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10475,7 +10494,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
-#, fuzzy
 msgid "Close the dialog and cancel authorization"
-msgstr "Zavřít dialog a ukončit stahování"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
@@ -10529,7 +10547,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498
-#, fuzzy, java-format
+#, java-format
 msgid "Authorizing request token ''{0}''..."
-msgstr "Chybějící povinný atribut ''{0}''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:504
@@ -10788,5 +10806,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Zvolte řádek k editaci"
@@ -10800,5 +10818,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10935,9 +10953,4 @@
 msgstr "Styl kreslení {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "Vrstva: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -10967,6 +10980,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr "Všechny"
@@ -11006,8 +11019,8 @@
 msgstr "Jedna barva (může být nastavena pro pojmenované vrstvy)"
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Auto"
@@ -11029,13 +11042,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Cyklisté"
@@ -11068,12 +11081,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "Pěší"
@@ -11125,11 +11138,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
-#, fuzzy
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
 "draw all lines."
 msgstr ""
-"Maximální délka (v metrech) pro vykreslování linií. Nastavte na ''-1'' pro "
-"kreslení všech linií."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
@@ -11359,5 +11369,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:296
 msgid "Download list"
-msgstr ""
+msgstr "Stáhnout seznam"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:297
@@ -11377,13 +11387,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:327
 msgid "Update the selected plugins"
-msgstr ""
+msgstr "Aktualizovat vybrané pluginy"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:379
 msgid "Configure sites..."
-msgstr ""
+msgstr "Nastavit zdroje..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:380
 msgid "Configure the list of sites where plugins are downloaded from"
-msgstr ""
+msgstr "Nastavit zdroje ze kterých budou stahovány pluginy"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
@@ -11770,4 +11780,6 @@
 "list of available plugins."
 msgstr ""
+"Prosím klikněte na <strong>Stáhnout seznam</strong> ke stažení a zobrazení "
+"seznamu dostupných plugnů."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:112
@@ -11867,9 +11879,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
-msgstr ""
+msgstr "Uživatelské jméno:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
 msgid "OSM password:"
-msgstr ""
+msgstr "Heslo:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
@@ -11880,4 +11892,8 @@
 "server. <strong>Do not use a valuable password.</strong></p></body></html>"
 msgstr ""
+"<html><body><p class=\"warning-body\"><strong>Varování:</strong> Heslo je "
+"uloženo v čistě textové podobě v souboru konfigurace JOSM. Navíc je zasíláno "
+"<strong>nezašifrované</strong> v každém požadavku na OSM server. "
+"<strong>Nepoužívejte svá tajná hesla.</strong></p></body></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:117
@@ -12044,5 +12060,12 @@
 msgstr "Smazat vybrané prvky v seznamu tagů"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -12050,18 +12073,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "Volitelné atributy:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr "uzavřená cesta"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Neznámý typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -12072,16 +12095,16 @@
 msgstr "Nelze načíst zdroj přednastavených tagů: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Chyba parsování {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, 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:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -12091,18 +12114,17 @@
 msgstr[2] "Změnit {0} objektů"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "Nic není zvoleno!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "Vybrány nevhodné objekty!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "Aplikovat přednastavení"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Změnit vlastnosti"
@@ -12120,17 +12142,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
 msgid "Min. latitude"
-msgstr ""
+msgstr "Min. šířka"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:73
 msgid "Min. longitude"
-msgstr ""
+msgstr "Min. délka"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:75
 msgid "Max. latitude"
-msgstr ""
+msgstr "Max. šířka"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:77
 msgid "Max. longitude"
-msgstr ""
+msgstr "Max. délka"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:87
@@ -12159,10 +12181,9 @@
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
 "capabilities. Got ''{2}''"
 msgstr ""
-"Neplatná hodnota pro atribut ''{0}'' na XML tagu ''{1}''. Nalezeno {2}."
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
@@ -12379,6 +12400,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12403,9 +12424,9 @@
 msgstr "Parsování souboru \"{0}\" selhalo"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Chyba parsování: Chybná struktura GPX dokumentu"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12421,7 +12442,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
-#, fuzzy
 msgid "Looking for image files"
-msgstr "Hledám pobřeží..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
@@ -12429,14 +12449,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, fuzzy, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "Nepodařilo se načíst CSS soubor ''help-browser.css''. Výjimka je: {0}"
+
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#, fuzzy, java-format
+#, java-format
 msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
-"v lokální datové sadě neexistuje prvek s id {0}. Nelze odvodit typ prvku"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308
@@ -12504,5 +12529,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "Importované souřadnice: "
@@ -12604,10 +12629,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Nahrávám {0} objektů ..."
-msgstr[1] "Nahrávám {0} objektů ..."
-msgstr[2] "Nahrávám {0} objektů ..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -13148,14 +13172,13 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159
-#, fuzzy, java-format
+#, java-format
 msgid "({0}/{1}) Uploading {2} object..."
 msgid_plural "({0}/{1}) Uploading {2} objects..."
-msgstr[0] "({0}/{1}) Nahrávám {2} objektů..."
-msgstr[1] "({0}/{1}) Nahrávám {2} objektů..."
-msgstr[2] "({0}/{1}) Nahrávám {2} objektů..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
 msgid "Uploading data ..."
-msgstr "Nahrávám data na serevr ..."
+msgstr "Nahrávám data na server ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192
@@ -13218,5 +13241,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Loading of the plugin \"{0}\" was requested.<br>This plugin is no "
@@ -13224,7 +13247,4 @@
 "disabled.<br>Delete from preferences?</html>"
 msgstr ""
-"<html>Požadováno nahrání pluginu {0}.<br>Vývoj tohoto pluginu byl ukončen a "
-"pravděpodobně bude působit problemy.<br>Měl by být deaktivován.<br>Chcete "
-"jej smazat z konfigurace?</html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:167
@@ -13240,7 +13260,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:194
-#, fuzzy
 msgid "Click to update the activated plugins"
-msgstr "Klikněte pro zavření dialogu"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
@@ -13253,5 +13272,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -13259,7 +13278,6 @@
 "Plugin {0} requires {1} plugins which were not found. The missing plugins "
 "are:"
-msgstr[0] "Plugin {0} je požadován pluginem {1}, ale nebyl nalezen."
-msgstr[1] "Plugin {0} je požadován pluginem {1}, ale nebyl nalezen."
-msgstr[2] "Plugin {0} je požadován pluginem {1}, ale nebyl nalezen."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13332,5 +13350,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:567
@@ -13345,7 +13362,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:625
-#, fuzzy, java-format
+#, java-format
 msgid "Click to delete the plugin ''{0}''"
-msgstr "Klikněte pro zavření dialogu"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
@@ -13381,7 +13398,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#, fuzzy, java-format
+#, java-format
 msgid "Click to disable the plugin ''{0}''"
-msgstr "Klikněte pro zavření dialogu"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:731
@@ -13425,12 +13442,11 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:890
-#, fuzzy
 msgid "Do not check and ask again at startup (remembers choice)"
-msgstr "Neptat se příště (zapamatovat si volbu)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:69
-#, fuzzy, java-format
+#, java-format
 msgid "The plugin file ''{0}'' does not include a Manifest."
-msgstr "Soubor \"{0}\" neexistuje"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:181
@@ -13527,5 +13543,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13533,8 +13548,4 @@
 "file a bug report."
 msgstr ""
-"Vyskytla se neošetřená výjimka.\n"
-"\n"
-"Chyba je v kódu programu. Pokud provozujete nejnovější\n"
-"verzi JOSM, buďte tak laskavi a chybu nahlašte."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13629,6 +13640,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -13674,5 +13685,5 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:244
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
@@ -13680,6 +13691,4 @@
 "applet and because you did not load your applet from ''{1}''.</html>"
 msgstr ""
-"<html>Nepodařilo se navázat komunikaci se serverem<br>''{0}''.<br>Prosím "
-"prověřte funkčnost internetového připojení.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
@@ -13759,6 +13768,6 @@
 msgstr "Nelze najít překlad pro jazyk {0}. Vracím se k {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13767,5 +13776,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -13913,4 +13922,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr "Viditelnost"
@@ -14001,5 +14011,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "Interpolace adres"
@@ -14596,5 +14606,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr "Umístění"
@@ -14760,21 +14770,21 @@
 "Odstraňte oblast z relace před rozdělením."
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr "Soubory TangoGPS (*.log)"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr "Chyby fomátu: "
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr "Import TangoGPS úspěšný"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr "Import TangoGPS selhal!"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr "TCX Soubory (*.tcx)"
@@ -14806,9 +14816,9 @@
 msgstr "Vytvořit duplikát cesty"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr "Vrstva pro editaci GPX tras"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Konvertovat do GPX vrstvy s anonymizací času"
@@ -14823,13 +14833,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr "Importovat cestu z GPX vrstvy"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr "Zahodit existující cestu"
@@ -14838,6 +14848,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr "Nenalezena vrstva s GPX daty."
@@ -15066,17 +15076,17 @@
 msgstr "Otevřít skupinu obrázků jako novou vrstvu."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr "Počáteční poloha se nachází mimo bbox"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:105
 msgid "Looking for shoreline..."
 msgstr "Hledám pobřeží..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -15120,42 +15130,41 @@
 msgstr "Odstraňuji duplicitní uzly..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr "Lakewalker trasování"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr "Došlo k neznámé chybě"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "východ"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "severovýchod"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "sever"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "severozápad"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "západ"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "jihozápad"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "jih"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "jihovýchod"
@@ -15211,6 +15220,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -15219,73 +15228,73 @@
 msgstr "voda"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "pobřeží"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "země"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Maximum number of segments per way"
 msgstr "Maximální počet úseků na cestu"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
 msgid "Maximum number of nodes in initial trace"
 msgstr "Maximální počet uzlů v prvotním trasování"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Maximální hodnota šedé braná jako voda (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
 msgid "Line simplification accuracy (degrees)"
 msgstr "Přesnost zjednodušování čar (stupňů)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Rozlišení dlaždic Landsat (pixelů na stupeň)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Velikost dlaždic Landsat (pixelů)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
 msgid "Shift all traces to east (degrees)"
 msgstr "Posunout všechny trasy na východ (stupňů)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
 msgid "Shift all traces to north (degrees)"
 msgstr "Posunout všechny trasy na sever (stupňů)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
 msgid "Direction to search for land"
 msgstr "Směr hledání země"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
 msgid "Tag ways as"
 msgstr "Tagovat cesty jako"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr "WMS vrstva"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr "Maximální velikost cache (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
 msgid "Maximum cache age (days)"
 msgstr "Maximální stáří cache (dnů)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:68
 msgid "Source text"
 msgstr "Zdrojový text"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr "Maximální počet úseků v každé vygenerované cestě. Výchozí hodnota 250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -15293,5 +15302,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -15301,5 +15310,5 @@
 "Může být v rozmezí 0-255. Výchozí hodnota 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -15310,5 +15319,5 @@
 "0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -15317,21 +15326,21 @@
 "4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Velikost jedné dlaždice z Landsatu, v pixelech. Výchozí hodnota 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Posun všech bodů východním směrem (stupňů). Výchozí hodnota 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Posun všech bodů severním směrem (stupňů). Výchozí hodnota 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Direction to search for land. Default east."
 msgstr "Směr hledání země. Standardně východ."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
@@ -15339,9 +15348,9 @@
 "je water."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "Která WMS vrstva má být vybrána k trasování ? Výchozí: IR1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
@@ -15349,26 +15358,26 @@
 "je 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 "Maximální stáří jednotlivých souborů v cache ve dnech. Výchozí hodnota je 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr "Text odkazující na použitý zdroj. Implicitně Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "Plugin pro trasování vodních ploch z fotografií Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr "Nastavení  pluginu Lakewalker"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:50
 msgid "Downloading image tile..."
 msgstr "Stahuji dlaždici..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr "Nemohu získat obrázek"
@@ -15392,5 +15401,5 @@
 msgstr "Připojení selhalo"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr "beze jména"
@@ -15421,5 +15430,5 @@
 msgstr "Kurz"
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr "LiveGPS vrstva"
@@ -15493,5 +15502,5 @@
 msgstr "Úhel mezi dvěmi zvolenými uzly"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr "Vrstva pro prováděná měření"
@@ -15761,4 +15770,76 @@
 msgid "Firefox executable"
 msgstr "Spustitelný soubor Firefoxu"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#, fuzzy
+msgid "Read error!"
+msgstr "Umělá vodní nádrž"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Zadejte souřadnice nového uzlu."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Zanechávat záložní soubory"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Chyba"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "Zadaný čas nemůže být rozparsován"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Nemohu přejmenovat soubor ''{0}''"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Zanechávat záložní soubory"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "Zanechávat záložní soubory"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Přepsat"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+#, fuzzy
+msgid "Could not delete temporary file!"
+msgstr "Nelze najít typ elementu"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
@@ -16034,6 +16115,6 @@
 msgstr "Uložit zachycená data do souboru každou minutu"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -16159,72 +16240,129 @@
 msgstr "Je třeba zadat zdroje předvoleb v konfiguraci."
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+#, fuzzy
+msgid "Terrace a house"
+msgstr "Řada budov"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+msgid "Interpolation"
+msgstr "Interpolace"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Uliční a silniční síť"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Nejvyšší domovní číslo"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Nejnižší domovní číslo"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+#, fuzzy
+msgid "Lowest housenumber of the terraced house"
+msgstr "Obrátit domovní čísla na řadě domů"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Vytvořit novou relaci"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Smazat duplicitní cesty"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Jméno ulice"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr "Nejnižší domovní číslo"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr "Nejvyšší domovní číslo"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr "Obrátit řadu domů"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr "Obrátit domovní čísla na řadě domů"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr "Obrátit řadu domů"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:83
+msgid "Cannot reverse!"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:125
 msgid "Reverse Terrace"
 msgstr "Obrátit řadu domů"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr "Řada budov"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr "Vytvoří jednotlivé budovy z dlouhého bloku budov."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr "Vyberte jednu uzavřenou cestu z alespoň čtyř uzlů"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr "Řada domů"
@@ -16459,5 +16597,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr "Duplicitní uzly"
@@ -16467,5 +16605,5 @@
 msgstr "Tento test kontroluje, jestli dva body nejsou na přesně stejné pozici."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16477,9 +16615,9 @@
 "<br>Opravdu je chcete smazat?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr "Potvrzení"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr "Uzly na stejné pozici"
@@ -16516,5 +16654,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -16665,7 +16803,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr "Neplatná kombinace klíče/hodnoty"
@@ -16673,80 +16811,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr "Problém s vykreslováním"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Klíč ''{0}'' je neplatný."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr "Klíče s prázdnými hodnotami"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr "Neplatné klíče vlastností"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr "Neplatná mezera v klíči vlastnosti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr "Hodnota začíná nebo končí mezerou"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr "Hodnota obsahuje HTML entitu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Klíč ''{0}'' není v předvolbách."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr "Předvolby neobsahují vlastnost klíč"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Hodnota ''{0}'' pro klíč ''{1}'' není v přednastavení"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr "Předvolby neobsahují vlastnost hodnota"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr "OPRAVY"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr "Kontrola klíčů vlastností."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Kontroluje platnost klíčů vlastností proti seznamu slov."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr "Použít komplexní kontrolu vlastností"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr "Kontroluje platnost hodnot a tagů pomocí komplexních pravidel."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr "zdroj TagCheckeru"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16754,86 +16892,86 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr "Přidat nový zdroj do seznamu."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr "Upravit zvolený zdroj."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "Smazat vybraný zdroj ze seznamu."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "Zdroje dat"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr "Kontrola hodnot vlastností."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr "Kontroluje platnost hodnot vlastností proti přednastaveným hodnotám."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr "Zkontrolovat tagy s FIXME."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Najít cesty a body s FIXME v jakékoliv hodnotě vlastnosti."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr "Kontroila, zda při kreslení mapy nebyly nalezeny chyby."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr "Použít stadardní datový soubor."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr "Použít standardní datový soubor (doporučeno)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr "Opravit vlastnosti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr "Nelze najít typ elementu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr "Nelze najít úroveň varování"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Neplatný výraz ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -17280,5 +17418,5 @@
 msgstr "WMS vrstva ({0}), stahování v přiblížení {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -17293,64 +17431,64 @@
 "znovu?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr "Ano, stahovat obrázky"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr "Neplatné URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
-msgid ""
-"The requested area is too big. Please zoom in a little, or change resolution"
-msgstr ""
-"Požadovaná plocha je příliš velká. Přibližte pohled nebo změňte rozlišení."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
 msgid "Download visible tiles"
 msgstr "Nahrát viditelné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+msgid ""
+"The requested area is too big. Please zoom in a little, or change resolution"
+msgstr ""
+"Požadovaná plocha je příliš velká. Přibližte pohled nebo změňte rozlišení."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "Změnit rozlišení"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr "Znovu nahrát chybné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr "Alfa kanál"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "Uložit WMS vrstvu do souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr "Uložit WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "Nahrát WMS vrstvu ze souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr "Načíst vrstvu WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, 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:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr "Chyba formátu souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "Chyba při nahrávání souboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr "Nastavit záložku WMS"
@@ -17626,6 +17764,13 @@
 "Otevřít Firefox a zobrazit pravě viditelnou obrazovku jako SVG obrázek."
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17636,15 +17781,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Ohromný JGoodies Plastic Look and Feel."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr "Umožní jiné aplikace posílat příkazy do JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17655,10 +17800,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr "Poskytuje směrování"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17669,15 +17814,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Umožní přidat ukazatele/body na současnou GPS polohu."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Poskytuje dialog umožňující editovat tagy v tabulce."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17687,10 +17832,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr "Vytváření řadových domků z jednotlivých bloků."
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17701,5 +17846,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17710,10 +17855,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Snadné stahovaní velmi dlouhých propojených cest"
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -17821,6 +17966,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -17828,6 +17982,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "Číslo"
@@ -17844,5 +17999,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Jízdních pruhů"
@@ -17864,10 +18019,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Max. rychlost (km/h)"
@@ -17911,14 +18066,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "Jednosměrka"
@@ -17961,13 +18116,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -18005,13 +18160,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Tunel"
@@ -18046,13 +18201,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "Zářez"
@@ -18087,13 +18242,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "Násep"
@@ -18225,4 +18380,13 @@
 msgid "Edit Unclassified Road"
 msgstr "Upravit místní silnici"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr ""
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -18240,15 +18404,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr "Šířka (metrů)"
@@ -18260,5 +18424,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Místní komunikace (ulice)"
@@ -18267,5 +18431,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "Upravit místní komunikaci (ulici)"
@@ -18283,16 +18447,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Povrch"
@@ -18314,166 +18481,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr "zpevněný"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr "nezpevněný"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr "asfalt"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr "beton"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr "kov"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "Prales"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr "dlažební kostky"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr "dlažební kostky"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "štěrk"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr "oblázky"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr "zhutněná"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "tráva"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "písek"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr "země"
@@ -18481,5 +18655,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr "Obytná zóna"
@@ -18488,5 +18662,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr "Upravit obytnou zónu"
@@ -18494,5 +18668,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "Pěší zóna"
@@ -18501,5 +18675,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "Upravit pěší zónu"
@@ -18507,5 +18681,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr "Účelová komunikace"
@@ -18514,5 +18688,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr "Upravit účelovou komunikaci"
@@ -18522,18 +18696,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr "Typ účelové komunikace"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr "ulička"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr "příjezdová cesta"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr "Obslužná silnice na parkovišti"
@@ -18541,5 +18715,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr "Obslužná silnice na parkovišti"
@@ -18549,5 +18723,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr "Editovat obslužnou silnici na parkovišti"
@@ -18555,5 +18729,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "Cesta (neznámý typ)"
@@ -18562,5 +18736,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "Upravit cestu neznámého typu"
@@ -18569,20 +18743,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "Silniční omezení"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "Upravit silniční omezení"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "Poplatek"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "Slepá komunikace"
@@ -18590,9 +18764,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 msgid "Access"
 msgstr "Přístup"
 
 #. 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"
@@ -18603,6 +18778,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18614,4 +18787,5 @@
 #. 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"
@@ -18630,141 +18804,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+msgid "yes"
+msgstr "ano"
+
+#. 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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "soukromý"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+msgstr "vyhrazený(preferovaný)"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:219
+msgid "destination"
+msgstr "dopravní obsluha"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr "na povolení"
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr "zemědelská vozidla"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-msgid "yes"
-msgstr "ano"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "soukromý"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-msgstr "vyhrazený(preferovaný)"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "dopravní obsluha"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr "na povolení"
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr "zemědelská vozidla"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "ne"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr "Zásobování"
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Nákladní vozidlo"
@@ -18779,10 +18961,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr "Kůň"
@@ -18798,10 +18980,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "Motocykl"
@@ -18816,27 +18998,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr "Motorové vozidlo"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr "Vozidla MHD"
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr "Motorová loď"
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "Loď"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Min. rychlost (km/h)"
@@ -18844,25 +19018,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "Max. hmotnost (tun)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr "Max. výška (metrů)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr "Max. šířka (metrů)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr "Max. délka (metrů)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "Kruhový objezd"
@@ -18873,5 +19047,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "Upravit křižovatku"
@@ -18891,10 +19065,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "dálnice"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr "Dálnice - nájezd"
@@ -18916,10 +19090,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "čtyřproudá silnice"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr "čtyřproudá silnice - nájezd"
@@ -18941,10 +19115,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "silnice první třídy"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr "Silnice 1. třídy - nájezd"
@@ -18966,5 +19140,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -18979,9 +19153,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "silnice třetí třídy"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr "silnice bez klasifikace"
@@ -18995,9 +19169,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "obytná oblast"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr "obytná zóna"
@@ -19027,10 +19201,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "obslužná cesta"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr "Autobusová dráha"
@@ -19060,5 +19234,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -19070,10 +19244,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Edituj most"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr "Upravit tunel"
@@ -19081,19 +19255,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Cesty"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "Komunikace ve výstavbě"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "Upravit silnici ve stavbě"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "Križovatka"
@@ -19109,5 +19283,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "kruhový objezd"
@@ -19115,5 +19289,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr "Lesní/polní cesta (track)"
@@ -19122,40 +19296,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr "Upravit vozovou cestu"
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "Lesní/polní cesta (track)"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "štěrk"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "štěrk"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "štěrk"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "štěrk"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "štěrk"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr ""
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -19163,5 +19331,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -19169,37 +19337,32 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr "turistická"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "Jízda na horském kole"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
-msgstr "Náročná horská stezka"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
-msgstr "Vysokohorská stezka"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
-msgstr "Náročná vysokohorská stezka"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
-msgstr "Obtížná vysokohorská stezka"
+msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "Pěšina, vychozená cesta pro pěší/cyklo (path)"
@@ -19208,12 +19371,32 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "Upravit cestu"
 
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr "pro středně pokročilé (červená)"
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
+
 #: build/trans_presets.java:489
-#, fuzzy
 msgid "Wheelchairs"
-msgstr "Invalidní vozík"
+msgstr ""
 
 #: build/trans_presets.java:490
@@ -19229,7 +19412,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "Upravit cestu pro koně"
+msgstr "Stezka pro koně"
 
 #. item "Ways/Dedicated Bridleway"
@@ -19242,7 +19424,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "Upravit cyklostezku"
+msgstr "Cyklostezka"
 
 #. item "Ways/Dedicated Cycleway"
@@ -19272,29 +19453,26 @@
 #: build/trans_presets.java:537
 msgid "Segregated Foot- and Cycleway"
-msgstr ""
+msgstr "Stezka pro pěší a cyklisty - dělená"
 
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "Přesto zkombinovat"
+msgstr "Stezka pro pěší a cyklisty - smíšená"
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "Upravit chodník nebo stezku"
+msgstr "Chodník, pěší stezka"
 
 #. 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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Upravit chodník nebo stezku"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr ""
@@ -19302,5 +19480,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "Schody"
@@ -19310,5 +19488,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Upravit schody"
@@ -19316,10 +19494,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr "Silniční body"
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "Dálniční sjezd (exit)"
@@ -19327,15 +19505,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "Upravit křižovatku dálnic"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "Číslo"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "Služby motoristům (odpočívadla)"
@@ -19343,5 +19521,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr "Upravit služby motoristům (odpočívadla)"
@@ -19349,5 +19527,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -19380,17 +19559,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "Operátor"
@@ -19399,5 +19578,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "Semafory"
@@ -19407,5 +19586,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr "Typ přechodu pro chodce"
@@ -19414,27 +19593,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr "volný"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr "světelná signalizace"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "ostrov"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr "neoznačený"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr "Přechod na koni"
@@ -19442,6 +19621,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr "Přechod na kole"
@@ -19450,11 +19629,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr "Dohled nad přechodem"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr "Typ přechodu (UK)"
@@ -19462,30 +19641,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr "zebra (bez semaforů)"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr "pelikán (se semafory)"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr "tukan (se semafory a tlačítkem pro chodce a cyklisty)"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr "papuchalk"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr "pegas (se semafory a tlačítkem pro chodce, cyklisty a jezdce na koni)"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr "tygr"
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "Stop"
@@ -19493,5 +19672,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr "Přechod pro chodce"
@@ -19500,14 +19679,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr "Upravit přechod"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr "Jméno typu (UK)"
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr "Malý kruhový objezd"
@@ -19518,14 +19743,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr "Směr"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr "po směru hodinových ručiček"
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr "Obratiště"
@@ -19535,26 +19760,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "Značka hranice sídla (rychlostní limit)"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "Upravit značka hranice sídla (rychlostní limit)"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr "Druhé jméno"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 msgid "Speed Camera"
 msgstr "Rychlostní radar"
 
 #. 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "Nouzový telefon"
@@ -19562,5 +19789,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr "Stoupání"
@@ -19568,5 +19795,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr "Prudké stoupání"
@@ -19574,11 +19801,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr "Brod"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr "Upravit brod"
@@ -19586,5 +19820,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr "Horský průsmyk"
@@ -19592,5 +19826,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr "Upravit horský průsmyk"
@@ -19602,7 +19836,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "Nadmořská výška"
@@ -19610,5 +19844,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Bariéry"
@@ -19616,5 +19850,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr "Sloupek"
@@ -19622,5 +19856,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr "Upravit sloupek"
@@ -19665,16 +19899,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "Povolený provoz:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr "Zábrana proti kolům"
@@ -19683,5 +19917,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr "Zátarasa"
@@ -19689,5 +19923,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr "Mříž proti dobytku"
@@ -19695,10 +19929,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr "Editovat mříž proti dobytku"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr "Zábrana průjezdná pouze autobusem"
@@ -19706,15 +19940,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr "Jednosměrné hroty"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr "Editovat jednosměrné hroty"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "Mýtná budka"
@@ -19722,5 +19956,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "Upravit mýtnou budku"
@@ -19728,10 +19962,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr "Hraniční kontrola"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr "Upravit hraniční kontrolu"
@@ -19741,5 +19975,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr "Živý plot"
@@ -19748,12 +19982,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:817 build/trans_presets.java:819
 msgid "Fence"
 msgstr "Plot"
 
-#. item "Barriers/Fence"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "Zeď"
@@ -19761,5 +20007,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "Městské hradby"
@@ -19768,5 +20014,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr "Opěrná zeď"
@@ -19778,15 +20024,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr "Vstup"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr "Upravit vstup"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "Brána"
@@ -19794,50 +20041,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr "Editovat bránu"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr "Závora"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr "Upravit závoru"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr "Odstranitelný díl plotu"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr "Editovat odstranitelný díl plotu"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr "Brána otevíratelná nárazníkem vozidla"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr "Editovat bránu otevíratelnou nárazníkem vozidla"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr "Průchod v ohrazení s ostrou zatáčkou"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr "Editovat průchod v ohrazení s ostrou zatáčkou"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr "Schůdky přes ohrazení"
@@ -19845,25 +20092,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr "Editovat schůdky přes ohrazení"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr "Turniket"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr "Upravit turniket"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr "Průchod se dvěma vraty"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr "Upravit průchod se dvěma vraty"
@@ -19874,11 +20121,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "Vodstvo"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "Pramen"
@@ -19886,5 +20133,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "Upravit pramen"
@@ -19892,5 +20139,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr "Odvodňovací kanál, meliorace"
@@ -19898,10 +20145,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr "Editovat odvodňovací kanál, meliorace"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "Potok"
@@ -19909,10 +20167,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "Upravit potok"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "Plavební kanál"
@@ -19920,10 +20178,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "Upravit plavební kanál"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "Řeka"
@@ -19933,5 +20191,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "Upravit řeku"
@@ -19939,15 +20197,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Upravit vodní plochu"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "Země (souš)"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "Upravit plochu země"
@@ -19955,15 +20213,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr "Vodní nádrž"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr "Upravit vodní nádrž"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr "Umělá vodní nádrž"
@@ -19971,15 +20229,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr "Upravit umělou vodní plochu"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr "Krytá vodní nádrž"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr "Upravit zakrytou umělou vodní plochu"
@@ -19987,5 +20245,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "Břeh řeky"
@@ -19994,10 +20252,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "Upravit břeh řeky"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr "Mokřina"
@@ -20008,14 +20266,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr "Upravit mokřinu"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "bažina"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr "močál"
@@ -20029,35 +20287,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr "mokřina"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr "rákosiny"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr "slanisko"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr "přílivová oblast"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "Bahno"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr "Upravit bahno"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "Pláž"
@@ -20065,20 +20323,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "Upravit pláž"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "Zátoka"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "Upravit zátoku"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "Útes"
@@ -20086,10 +20344,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "Upravit útes"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "Linie pobřeží"
@@ -20097,5 +20355,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "Upravit linii pobřeží"
@@ -20103,5 +20361,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "Přívoz"
@@ -20109,5 +20367,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr "Upravit přívoz"
@@ -20116,5 +20374,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr "doky"
@@ -20122,10 +20380,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr "Upravit doky"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "Dok"
@@ -20133,5 +20391,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr "Upravit dok"
@@ -20139,5 +20397,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "Hráz přehrady"
@@ -20145,15 +20403,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "Upravit přehradu"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr "Vodní objekty"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr "Plavební komora"
@@ -20162,5 +20420,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr "Jez"
@@ -20168,20 +20426,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr "Upravit jez"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "Vodopád"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "Upravit vodopád"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr "Rožšířené místo pro otáčení lodí"
@@ -20190,15 +20448,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr "Přístav"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr "Upravit přístav"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "Molo"
@@ -20206,10 +20464,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "Upravit molo"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr "Přístaviště přívozu"
@@ -20217,10 +20475,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr "Upravit přístaviště přivozu"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr "Skluz v loděnici"
@@ -20230,20 +20488,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr "Upravit skluz v loděnici"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr "Doprava"
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "Železnice"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "Železnice"
@@ -20251,5 +20509,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr "Upravit železnici"
@@ -20258,139 +20516,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr "standardní"
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr "seřazovací kolej"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr "paralelní pomocná dráha"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr "vlečka"
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr "železnice"
+
+#. 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:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+msgid "Voltage"
+msgstr "Napětí"
+
+#. 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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr "Úzkorozchodná železnice"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr "Upravit úzkorozchodnou železnici"
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr "Monorail"
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr "Upravit monorail"
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr "Historická trať"
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr "Upravit historickou trať"
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr "Krátká/lehká trať"
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr "Upravit krátká/lehká trať"
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "Metro"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "Upravit metro"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "Tramvaj"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr "Upravit tramvaj"
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr "Autobusová dráha"
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr "Upravit autobusovou dráhu"
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "Nepoužívaná železnice"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "Upravit nepoužívanou železnici"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr "Volitelné typy"
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr "seřazovací kolej"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr "paralelní pomocná dráha"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr "vlečka"
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr "Úzkorozchodná železnice"
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr "Upravit úzkorozchodnou železnici"
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr "Monorail"
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr "Upravit monorail"
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr "Historická trať"
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr "Upravit historickou trať"
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr "Krátká/lehká trať"
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr "Upravit krátká/lehká trať"
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "Metro"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "Upravit metro"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "Tramvaj"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr "Upravit tramvaj"
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr "Autobusová dráha"
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr "Upravit autobusovou dráhu"
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "Nepoužívaná železnice"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "Upravit nepoužívanou železnici"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "Snesená železnice (pouze žel. spodek)"
@@ -20399,5 +20896,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr "Železniční přejezd"
@@ -20406,5 +20903,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr "Železniční přechod pro chodce"
@@ -20414,5 +20911,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr "Druh křížení"
@@ -20420,5 +20917,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "Točna"
@@ -20427,10 +20924,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr "Lanovky"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "Sedačková lanovka"
@@ -20438,10 +20942,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr "Upravit sedačkovou lanovku"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr "Lyžařský vlek"
@@ -20449,10 +20953,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr "Upravit lyžařský vlek"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "Kyvadlová kabinková lanovka"
@@ -20460,10 +20964,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "Upravit kyvadlovou kabinkovou lanovku"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr "Oběžná kabinková lanovka"
@@ -20471,10 +20975,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr "Upravit oběžnou kabinkovou lanovku"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20482,12 +20986,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr "Upravit stanici"
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "Čerpací stanice"
@@ -20497,9 +21014,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Upravit čerpací stanici"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20553,32 +21127,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "Otevírací doba"
@@ -20637,94 +21211,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Po-Pá 08:30-20:00"
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Út-Ne 08:00-15:00; So 08:00-12:00"
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20736,5 +21386,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20744,5 +21394,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Upravit parkoviště"
@@ -20753,25 +21403,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr "Číslo záchodu"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "vícepodlažní"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "povrchové"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr "podzemní"
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr "Parkoviště P+R"
@@ -20780,48 +21430,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "Poplatek"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr "Kapacita (celkem)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr "Místa pro vozíčkáře"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "Myčka"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "Upravit myčku aut"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "Opravna"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "Upravit autoopravnu"
@@ -20829,5 +21479,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "Půjčovna"
@@ -20836,10 +21486,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "Upravit půjčovnu aut"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr "Sdílené vlastnictví vozidel"
@@ -20847,5 +21497,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr "̈́Upravit sdílené vlastnictví vozidel"
@@ -20853,10 +21503,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "Upravit parkoviště pro kola."
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr "Kapacita"
@@ -20865,15 +21515,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "Upravit půjčovnu kol"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Hromadná doprava"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -20883,5 +21533,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -20889,5 +21539,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -20895,5 +21545,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr "Vlaková zastávka"
@@ -20901,5 +21551,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr "Upravit železniční zastávku"
@@ -20907,5 +21557,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "Tramvajová zastávka"
@@ -20914,5 +21564,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "Upravit tramvajovou zastávku"
@@ -20920,5 +21570,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "Kolejové nástupiště (tram/vlak)"
@@ -20927,5 +21577,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "Upravit kolejové nástupiště (tram/vlak)"
@@ -20937,5 +21587,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr "Číslo nástupiště"
@@ -20943,10 +21593,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr "Označit jako plochu"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "Vchod do metra"
@@ -20955,10 +21605,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "Upravit vchod do metra"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr "Invalidní vozík"
@@ -20967,5 +21617,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "Autobusové nádraží"
@@ -20974,5 +21624,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "Upravit autobusové nádraží"
@@ -20980,5 +21630,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "Zastávka autobusu"
@@ -20988,5 +21638,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "Upravit zastávku autobusu"
@@ -20995,25 +21645,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr "Přístřešek"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "Lavička"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr "Nástupiště autobusu"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr "Upravit nástupiště autobusu"
@@ -21021,5 +21672,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "Stanoviště taxi"
@@ -21027,5 +21678,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "Upravit stanoviště taxi"
@@ -21033,32 +21684,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "Letiště"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr "Upravit letiště"
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr "IATA"
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr "ICAO"
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr "Přistávací dráha (runway)"
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr "Upravit přistávací dráha"
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr "Pojížděcí dráha (taxiway)"
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr "Upravit pojížděcí dráhu"
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+msgid "Beacon"
+msgstr "Vodní bój"
+
+#. 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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr "Cestování"
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Ubytování"
@@ -21070,5 +21816,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -21077,15 +21823,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "Upravit hotel"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "Počet hvězdiček"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr "Motel"
@@ -21093,20 +21839,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr "Upravit motel"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr "Penzion"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr "Upravit penzion"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "Horská chata"
@@ -21114,10 +21860,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr "Upravit horskou chatu"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr "Hostel"
@@ -21125,30 +21871,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr "Upravit hostel"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr "Horská bouda"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr "Upravit vysokohorskou boudu"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr "Autokemping (karavany)"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr "Upravit autokemping (karavany)"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "Tábořiště"
@@ -21156,10 +21902,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr "Upravit tábořiště"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Jídlo a pití"
@@ -21170,5 +21916,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurace"
@@ -21176,5 +21922,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "Upravit restauraci"
@@ -21182,5 +21928,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr "Kuchyně"
@@ -21188,61 +21934,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "italská"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "čínská"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "řecká"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "německá"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "indická"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "místní"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "turecká"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "asijská"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "thajská"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "mexická"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "japonská"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "Rychlé občersvení"
@@ -21250,9 +22008,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "Upravit rychlé občerstvení"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "Kavárna"
@@ -21260,9 +22026,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "Upravit kavárnu"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "Hospoda"
@@ -21270,18 +22036,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "Upravit hospodu"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr "Hospoda-zahrádka"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr "Upravit hospoda-zahrádka"
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr "Bar"
@@ -21289,9 +22055,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr "Upravit bar"
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "Noční klub"
@@ -21299,24 +22065,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "Upravit noční klub"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Turistika"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr "Atrakce"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr "Upravit atrakci"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Muzeum"
@@ -21324,9 +22090,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Upravit muzeum"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Zoo"
@@ -21335,9 +22101,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Upravit zoo"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "Vyhlídka"
@@ -21345,24 +22111,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "Upravit vyhlídku"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr "Vyhlídková věž"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "Zábavní park"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr "Upravit zábavní park"
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "Umělecké dílo"
@@ -21370,5 +22136,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "Upravit umělecké dílo"
@@ -21376,19 +22142,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr "Turistické informační centrum"
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Přehledová mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr "Úroveň detailů"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr "topografická"
@@ -21426,5 +22192,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -21432,28 +22198,28 @@
 msgstr "ulice"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr "orientační"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr "Zobrazený areál"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr "místo"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr "město"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr "Bližší popis"
@@ -21463,5 +22229,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr "Trasy zobrazeny pro:"
@@ -21469,5 +22235,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr "turistická stezka"
@@ -21475,6 +22241,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "Cyklistika"
@@ -21482,5 +22248,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr "Jízda na horském kole"
@@ -21488,6 +22254,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "Lyžování"
@@ -21495,5 +22261,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr "Jízda na koni"
@@ -21501,46 +22267,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr "Informační nástěnka"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr "Obsah tabule"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr "upozornění"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "informace o historii"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr "informace o přírodě"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr "informace o divokých zvířatech"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr "Rozcestník"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr "Informační terminál"
@@ -21548,29 +22314,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr "Bližší popis"
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr "Audioprůvodce"
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr "Audioprůvodce přes mobilní telefon?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr "Telefonní číslo"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr "Jiný informační bod"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr "Upravit přístřešek"
@@ -21578,25 +22344,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr "Ohniště"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "Místo na piknik"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "Upravit místo na piknik"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Historická místa"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Zámek/Hrad"
@@ -21605,19 +22371,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Upravit zámek/hrad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Zřícenina"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Upravit zříceninu"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Archeologické naleziště"
@@ -21626,9 +22392,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "Upravit archeologické naleziště"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "Bojiště"
@@ -21636,10 +22402,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "Upravit bojiště"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr "Paleontologické naleziště"
@@ -21647,5 +22413,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr "Upravit paleontologické naleziště"
@@ -21653,15 +22419,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "Upravit monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "Památník"
@@ -21669,55 +22435,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "Upravit památník"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr "Kříž"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr "Upravit kříž"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr "Boží muka"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr "Upravit boží muka"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr "Hraniční kameny"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr "Upravit hraniční kameny"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Volný čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "Akvapark"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "Upravit akvapark"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Hřiště"
@@ -21725,35 +22491,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Upravit hřiště"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Rybaření"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "Upravit rybaření"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr "Sportovní potřeby"
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr "Sportovní zařízení"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Upravit stadion"
@@ -21767,6 +22533,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "vyberte sport:"
@@ -22158,6 +22924,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -22191,225 +22957,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr "kombinovaný"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "lukostřelba"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr "atletika"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "australský fotbal"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "basketbal"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr "Hry s koulemi (např. pétanque)"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr "bowls"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr "kanoistika"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "Horolezení"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr "ohražené místo pro tréning kriketu"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr "kroket"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "cyklistika"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr "závody psů"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr "krasojízda"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "fotbal"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "gymnastika"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr "dostihy"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr "motoristické sporty"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr "pelota (míčová hra)"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr "pálkové (raketové) sporty"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr "ragby"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "střelba"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr "bruslení"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "lyžování"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "fotbal"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "plavání"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "stolní tenis"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "Sportovní centrum"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "Upravit sportovní centrum"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr "Hřiště"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr "Upravit hřiště"
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr "Závodní trať"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr "Upravit závodní trať"
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "Golfové hřiště"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "Upravit golfové hřiště"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "Upravit minigolf"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr "Kombinováné"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr "Upravit kombinované"
@@ -22448,21 +23214,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "typ"
@@ -22501,203 +23267,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr "hřiště"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "sportovní centrum"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr "Upravit bowling"
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr "Atletika"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr "Upravit atletiku"
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "Lukostřelba"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "Upravit lukostřelbu"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "Horolezení"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "Upravit horolezení"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr "Kanoistika"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr "Upravit kanoistiku"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr "Upravit cyklistiku"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "Závody psů"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr "Upravit závody psů"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr "Krasojízda"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr "Upravit krasojízdu"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr "Dostihy"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr "Upravit dostihy"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "Gymnastika"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr "Upravit gymnastiku"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "Motorové sporty"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr "Upravit motorové sporty"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr "Bruslení"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr "Upravit bruslení"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr "Upravit Skateboard"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "Plavání"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "Upravit plavání"
@@ -22705,56 +23471,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr "Upravit lyžování"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr "Typ sjezdovky"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr "Sjezdovka"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr "Běžecká trať"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr "snow park"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr "Obtížnost"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr "pro začátečníky (zelená)"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr "jednoduchá (modrá)"
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr "pro středně pokročilé (červená)"
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr "pro zkušené (černá)"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr "pro experty (oranžová)"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr "volný terén - freeride (žlutá)"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "Střelba"
@@ -22762,182 +23524,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "Upravit střelbu"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "Sport (míčové hry)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "Fotbal"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr "Upravit fotbal"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "Fotbal"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr "Upravit fotbal"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr "Australský fotbal"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr "Upravit australský fotbal"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr "Upravit baseball"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "Basketbal"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "Upravit basketbal"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr "Upravit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "golfové hřiště"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr "Hry s koulemi (např. pétanque)"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr "Upravit hry s koulemi (např. pétanque)"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr "Upravit Bowls"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr "Upravit kriket"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr "Ohražené místo pro tréning kriketu"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr "Upravit ohražené místo pro tréning kriketu"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr "Kroket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr "Upravit kroket"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "Upravit hokej"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr "Pelota (míčová hra)"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr "Upravit pelotu (míčová hra)"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr "Pálkové (raketové) sporty"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr "Upravit pálkové (raketové) sporty"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "Ragby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr "Upravit ragby"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "Stolní tenis (ping-pong)"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "Upravit stolní tenis (ping-pong)"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "Upravit tenis"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr "Objekty a další POI"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Budovy"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "Budova"
@@ -22945,5 +23707,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Veřejná budova"
@@ -22951,10 +23713,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Upravit veřejnou budovu"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "Radnice"
@@ -22962,10 +23724,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Upravit radnici"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Ambasáda"
@@ -22973,10 +23735,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Upravit ambasádu"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "Soud"
@@ -22985,10 +23747,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Upravit soud"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Vězení"
@@ -22997,10 +23759,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Upravit vězení"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Policie"
@@ -23010,10 +23772,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Upravit policii"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "Hasičská stanice"
@@ -23022,10 +23784,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Upravit hasičskou stanici"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Pošta"
@@ -23033,5 +23795,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Upravit poštu"
@@ -23039,15 +23801,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "Mateřská škola"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "Upravit mateřskou školu"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "Základní škola"
@@ -23055,10 +23817,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "Upravit školu"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "Vysoká škola"
@@ -23066,10 +23828,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "Upravit vysokou školu"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "Střední škola"
@@ -23077,5 +23839,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "Upravit střední školu"
@@ -23083,5 +23845,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Kino"
@@ -23090,10 +23852,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Upravit kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "Knihovna"
@@ -23102,9 +23864,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Upravit knihovnu"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "Komunitní umělecké centrum"
@@ -23112,10 +23874,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "Upravit komunitní umělecké centrum"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Divadlo"
@@ -23124,10 +23886,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Upravit divadlo"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "Chrám(kostel, synagoga, mešita)"
@@ -23137,5 +23899,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "Upravit chrám"
@@ -23144,6 +23906,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "Náboženství"
@@ -23152,66 +23914,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr "bahá'í"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "budhistické"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "křesťanské"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "hindské"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr "džinistické"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "židovské"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "muslimské"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr "spiritualistické"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr "taoistické"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr "Unitářské"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr "zoroastristické"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr "Vyznání"
@@ -23220,81 +23982,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr "anglikánské"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "baptistické"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "katolické"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr "evangelické"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr "svědkové Jehovovi"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "luteránské"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr "metodistické"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr "mormonské"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "pravoslavné"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr "pentekostalistické"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr "presbyteriánské"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "protestantské"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr "kvakerské"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr "ší'itské"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr "sunnitské"
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Adresy"
@@ -23303,5 +24065,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Upravit informace o adrese"
@@ -23309,5 +24071,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "Číslo domu"
@@ -23315,25 +24077,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "Jméno domu"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Jméno ulice"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "Jméno města"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Poštovní směrovací číslo"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "Kód země"
@@ -23342,5 +24104,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "Upravit interpolaci adres"
@@ -23348,61 +24110,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr "Schéma číslování"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "liché"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "sudé"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr "abecední"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr "Inženýrské objekty"
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "Továrna"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "Upravit továrnu"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Věž"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Upravit věž"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr "Typ věže"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr "telekomunikační"
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr "pozorovací"
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr "Výška (metrů)"
@@ -23410,25 +24172,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Vodojem"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Upravit vodojem"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "Plynojem"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "Upravit plynojem"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "Maják"
@@ -23436,10 +24198,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Upravit maják"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Větrný mlýn"
@@ -23447,10 +24209,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Upravit větrný mlýn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Potrubí"
@@ -23459,37 +24221,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Upravit potrubí"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
+msgid "gas"
+msgstr "plynová"
+
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr "teplo"
+
+#: build/trans_presets.java:2353
 msgid "oil"
 msgstr "ropa"
 
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-msgid "gas"
-msgstr "plynová"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr "kanalizace"
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr "teplo"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr "podvodní"
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr "nadzemní"
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "Čistička odpadních vod"
@@ -23499,10 +24261,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "Upravit čističku odpadních vod"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Jeřáb"
@@ -23510,21 +24272,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Upravit jeřáb"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr "Vodní bój"
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr "Editovat vodní bój"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "Triangulační bod"
@@ -23532,10 +24289,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "Upravit triangulační bod"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "Sledovací kamera"
@@ -23543,11 +24300,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Upravit sledovací kameru"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "Elektrárna"
@@ -23557,35 +24326,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "Upravit elektrárnu"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "větrná"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "vodní"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "fosilní paliva"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "jaderná"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "uhelná"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr "sluneční"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "Rozvodna"
@@ -23594,10 +24363,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "Upravit rozvodnu"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "Trafostanice"
@@ -23606,5 +24375,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "Upravit trafostanici"
@@ -23612,10 +24381,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr "Číslo vedení"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "Stožár elektrického vedení"
@@ -23626,23 +24395,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "Upravit stožár elektrického vedení"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr "věž"
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr "stožár"
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "Dráty elektrického vedení"
@@ -23651,79 +24420,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "Upravit dráty elektrického vedení"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr "Typ vedení"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr "vedení"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr "vedlejší vedení"
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "Napětí"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr "Počet kabelů"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr "jednoduchý"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr "dvojitý"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr "trojitý"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr "čtveřitý"
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr "Občanská vybavenost"
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Záchody"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr "Poznámka"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "Poštovní schránka"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Telefon"
@@ -23732,5 +24496,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Upravit telefon"
@@ -23738,5 +24502,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Mince"
@@ -23744,5 +24508,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "Bankovky"
@@ -23750,5 +24514,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronické peněženky nebo kreditní karty."
@@ -23756,5 +24520,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr "Debetní karty"
@@ -23762,15 +24526,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Kreditní karty"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Telefonní karty"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Recyklační stanoviště"
@@ -23779,5 +24543,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Upravit recyklační stanoviště"
@@ -23785,63 +24549,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "Baterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "Plechovky"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "Oblečení"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "Sklo"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "Papír"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "Kovový šrot"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr "Odpadkový koš"
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+msgid "Edit Waste Basket"
+msgstr "Upravit odpadkový koš"
 
 #. item "Amenities/Bench"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr "Opěrka zad"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr "Materiál"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr "kámen"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr "plast"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr "Barva"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr "černá"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr "hnědá"
@@ -23920,5 +24695,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -23928,31 +24703,31 @@
 msgstr "zeleň"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr "červená"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr "modrá"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr "šedá"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr "bílá"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr "Počet sedadel"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr "Posed"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr "Upravit posed"
@@ -23961,30 +24736,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "Výška"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr "nízká"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr "střední"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr "plná"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr "Úkryt"
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr "Uzamknutelný"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "Fontána"
@@ -23993,10 +24768,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "Upravit fontánu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "Pitná voda"
@@ -24005,10 +24780,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Upravit pitnou vodu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+msgid "Fire Hydrant"
+msgstr "Požární hydrant"
+
+#. 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:2517
+msgid "Edit Fire Hydrant"
+msgstr "Upravit požární hydrant"
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr "Babybox"
@@ -24016,15 +24804,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr "Upravit babybox"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Obchody"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr "Prodejce automobilů"
@@ -24032,10 +24820,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "Upravit obchod s auty"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr "Prodejce kol"
@@ -24044,28 +24832,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "Upravit prodejnu kol"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "Upravit supermarket"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr "Drogerie"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr "Upravit drogerii"
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr "Samoobsluha, smíšenka, večerka"
@@ -24073,9 +24861,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr "Upravit večerku"
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "Kiosek"
@@ -24083,27 +24871,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "Upravit kiosek"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr "Knihkupectví"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr "Upravit knihkupectví"
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr "Cestovní kancelář"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr "Upravit cestovní kancelář"
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "Prodejní automat"
@@ -24111,5 +24899,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "Upravit prodejní automat"
@@ -24117,88 +24905,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "Prodávané produkty"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr "lístky na městskou hromadnou dopravu"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr "plány městské hromadné dopravy"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr "parkovací lístky"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "jídlo"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "pití"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "sladkosti"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "cigarety"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "fotografie"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "krmivo pro zvířata"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "noviny"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "hračky"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "známky"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "SIM-karty"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr "telefonní karty"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr "poukazy"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "kondomy"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr "tampóny"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr "sáčky na výkaly"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 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:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "Řeznictví"
@@ -24206,9 +24994,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Upravit řeznictví"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "Pekařství"
@@ -24216,9 +25004,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Upravit pekařství"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "Květinářství"
@@ -24226,18 +25014,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "Upravit květinářství"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr "Obchod se zdravou výživou"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr "Upravit obchod se zdravou výživou"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -24245,54 +25033,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr "Upravit obchod s alkoholem"
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr "Nápoje"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr "Upravit obchod s nápoji"
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr "Počítače"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "Upravit obchod s počítači"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr "Elektronika"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "Upravit obchod s elektronikou"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr "Upravit obchod s hifi"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr "Nábytek"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "Upravit obchod s nábytkem"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr "Zahradnické centrum"
@@ -24300,9 +25088,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr "Upravit zahradnické centrum"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr "Železářství"
@@ -24310,9 +25098,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr "Upravit železářství"
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "Zboží pro kutily"
@@ -24320,54 +25108,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "Upravit obchod se zbožím pro kutily"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr "Papírnictví"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr "Upravit papírnictví"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "Kadeřnictví"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "Upravit Kadeřnictví"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr "Obuv"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "Upravit obchod s obuví"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr "Hračky"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "Upravit obchod s hračkami"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr "Videopůjčovna/prodejna"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr "Upravit videopůjčovnu/prodejnu"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Čistírna"
@@ -24375,9 +25163,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Upravit čistírnu"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Prádelna"
@@ -24385,9 +25173,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Upravit prádelnu"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr "Vybavení do přírody"
@@ -24395,28 +25183,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr "Obchod s vybavením do přírody"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr "Upravit obchod se sportovními pořebami"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr "Oční optik"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "Upravit oční optiku"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Finance"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Banka"
@@ -24424,14 +25212,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Upravit banku"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Směnárna"
@@ -24439,5 +25227,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Upravit směnárnu"
@@ -24445,15 +25233,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Upravit bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Zdraví"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "Středisko"
@@ -24461,18 +25249,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "Upravit středisko"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "Zubař"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "Upravit zubařskou ordinaci"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Lékárna"
@@ -24480,5 +25268,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Upravit lékárnu"
@@ -24486,9 +25274,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr "Vydává léky na předpis"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Nemocnice"
@@ -24496,10 +25284,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Upravit nemocnici"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr "Místo pro kontaktování záchranářů"
@@ -24508,5 +25296,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr "Upravit místo pro kontaktování záchranářů"
@@ -24515,20 +25303,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr "Číslo místa"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr "Jméno místa"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "Telefonní číslo"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Použijte mezinárodní zápis, např. +420123456789)"
@@ -24536,5 +25324,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "Veterinář"
@@ -24543,64 +25331,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "Upravit veterinární ordinaci"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr "Geografie"
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Místa"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Upravit kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "Stát"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Upravit stát"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "Země"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "Upravit zemi"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "Kraj"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "Upravit kraj"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr "Okres"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr "Upravit okres"
@@ -24608,15 +25396,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "Velkoměsto"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "Upravit velkoměsto"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "Město"
@@ -24624,10 +25412,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "Upravit město"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "Městský obvod, nebo městská část"
@@ -24635,25 +25423,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "Upravit městský obvod, nebo městská část"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Obec"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Upravit obci"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "Samota"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "Upravit samotu"
@@ -24661,5 +25449,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr "Místní název"
@@ -24667,10 +25455,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr "Editovat místní název"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "Ostrov"
@@ -24678,10 +25466,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Upravit ostrov"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr "Ostrůvek"
@@ -24689,5 +25477,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr "Upravit ostrůvek"
@@ -24695,5 +25483,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "Vstup do jeskyně"
@@ -24701,10 +25489,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "Upravit vstup do jeskyně"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Vrchol"
@@ -24712,10 +25500,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Upravit vrchol"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "Ledovec"
@@ -24723,10 +25511,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "Upravit ledovec"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "Sopka"
@@ -24734,70 +25522,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "Upravit sopku"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Hranice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "Národní"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "Upravit národní hranici"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "Administrativní"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "Upravit administrativní hranici"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr "Volební obvod"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "Upravit volební obvod"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr "Národní park"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "Upravit hranice národního parku"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Využití krajiny"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Strom"
@@ -24806,15 +25594,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Upravit strom"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "Botanické jméno"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "Prales"
@@ -24823,5 +25611,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "Editovat Prales"
@@ -24829,17 +25617,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "jehličnatý"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "listnatý"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "smíšený"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "Les"
@@ -24848,14 +25636,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "Upravit lesní plochu"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "Přírodní rezervace"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "Upravit přírodní rezervaci"
@@ -24863,25 +25651,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr "Suťoviště"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr "Upravit suťoviště"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr "Podrost"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr "Upravit podrost"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr "Travnatá pahorkatina"
@@ -24889,10 +25677,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr "Upravit travnatou pahorkatinu"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr "Vřesoviště"
@@ -24900,5 +25688,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "Upravit vřesoviště"
@@ -24906,5 +25694,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr "Farma"
@@ -24913,45 +25701,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr "Upravit farmu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "Zemědělská půda"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr "Upravit zemědělskou půdu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr "Louka"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr "Upravit louku"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "Vinice"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "Upravit vinici"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr "Zahrádkářská kolonie"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr "Upravit zahrádkářskou kolonii"
@@ -24959,25 +25747,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "Zahrada"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "Upravit zahradu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "Tráva"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr "Upravit travnatou plochu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr "Zelená plocha"
@@ -24985,10 +25773,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr "Upravit zelenou plochu"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr "veřejná zeleň (mimo parky)"
@@ -24996,20 +25784,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr "Upravit veřejnou zeleň"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "Upravit park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr "Rekreační plocha"
@@ -25017,5 +25805,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr "Upravit rekreační plochu"
@@ -25023,15 +25811,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "Obytná plocha"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr "Upravit obytnou plochu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "Malý hřbitov"
@@ -25039,9 +25827,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Upravit malý hřbitov"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "Hřbitov"
@@ -25049,39 +25837,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "Upravit hřbitov"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "Obchody"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr "Upravit plochu s obchody"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "Kanceláře"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr "Upravit kancelářskou plochu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "Průmysl"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr "Upravit průmyslovou plochu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr "Železniční plocha"
@@ -25089,15 +25877,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr "Upravit železniční plochu"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "Vojenský prostor"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr "Upravit vojenský prostor"
@@ -25105,50 +25893,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "Probíhající výstavba"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "Upravit výstavbu"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr "Stará zátěž, městské ruiny (Brownfield)"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr "Upravit starou zátěž (Brownfield)"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr "Zastavitelné území (Greenfield)"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr "Upravit zastavitelné území (Greenfield)"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr "skládka odpadu"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr "Upravit skládku odpadu"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "Lom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "Upravit lom"
@@ -25158,5 +25946,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr "Upravit multipolygon"
@@ -25165,10 +25953,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr "vnější část"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr "vnitřní část"
@@ -25176,5 +25964,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr "Zákaz odbočení"
@@ -25183,5 +25971,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr "Upravit zákaz odbočení"
@@ -25189,34 +25977,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr "Omezení"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr "zákaz odbočení vlevo"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr "zákaz odbočení vpravo"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr "zákaz jízdy rovně"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr "zákaz otáčení"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr "pouze odbočení vpravo"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr "pouze odbočení vlevo"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr "pouze jízda rovně"
@@ -25225,15 +26013,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr "z cesty"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr "přes uzel nebo cestu"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr "na cestu"
@@ -25241,5 +26029,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr "Trasa"
@@ -25248,5 +26036,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr "Upravit trasu"
@@ -25254,5 +26042,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr "Typ trasy"
@@ -25343,5 +26131,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -25351,17 +26139,17 @@
 msgstr "bicykl"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr "silnice"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr "trajekt"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr "lyžařská"
@@ -25421,5 +26209,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -25428,9 +26216,9 @@
 msgstr "pěší"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr "tramvajová"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr "objízdná"
@@ -25444,10 +26232,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr "Popis symbolu"
@@ -25455,31 +26243,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr "Síť"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr "navrhovaná"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr "alternativní"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr "dočasná"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr "spojení"
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr "Barva (hex)"
@@ -25488,107 +26276,32 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr "segment trasy"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr "dopředný segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr "zpětný segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr "zastávka"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr "dopředná zastávka"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 msgid "backward halt point"
 msgstr "zpětná zastávka"
-
-#. <!--
-#. 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 "standardní"
 
 #. mappaint style named "standard"
@@ -26124,77 +26837,4 @@
 msgid "highway_track"
 msgstr "dálnice"
-
-#. 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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
-msgstr "železnice"
 
 #. color rail
@@ -26582,7 +27222,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "baptistické"
+msgstr ""
 
 #. color manmade
@@ -29721,141 +30360,90 @@
 msgstr "Sicily - Itálie"
 
-#~ msgid "The plugin could not be removed. Probably it was already disabled"
-#~ msgstr "Plugin nelze odstranit. Pravděpodobně je již neaktivní."
-
-#~ msgid "Bridleway"
-#~ msgstr "Hypostezka, stezka pro koně"
-
-#~ msgid "Cycleway"
-#~ msgstr "Cyklostezka"
-
-#~ msgid "Footway"
-#~ msgstr "Chodník, stezka pro chodce"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Lesní/polní cesta kvalita 1 (zpevněná)"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Upravit vozovou cestu stupně 1 (zpevněnou)"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Lesní/polní cesta kvalita 2"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Upravit vozovou cestu stupně 2"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Lesní/polní cesta kvalita 3"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Upravit vozovou cestu stupně 3"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Lesní/polní cesta kvalita 4"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Upravit vozovou cestu stupně 4"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Lesní/polní cesta kvalita 5 (nejhorší)"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Upravit vozovou cestu stupně 5 (nejhorší)"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Editovat turistickou stezka"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "horská turistická stezka"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Editovat horskou stezka"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Editovat náročnou horskou stezku"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Editovat vysokohorskou stezku"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Editovat náročnou vysokohorskou stezku"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Upravit obtížnou vysokohorskou stezku"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "Očekáváno Id > 0, zadáno {0}"
-
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "Parametr ''{0}'' nesmí být null"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parametr ''{0}'' nesmí být null"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr ""
-#~ "byla očekávána instance OsmDataLayer nebo GpxLayer, ale ve skutečnosti "
-#~ "je: ''{0}''."
-
-#~ msgid ""
-#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
-#~ "This can lead to nodes being deleted accidentally.\n"
-#~ "Are you really sure to continue?"
-#~ msgstr ""
-#~ "Zvolené cesty mají uzly mimo hranice stažené oblasti.\n"
-#~ "Toto může vést k nechtěnému smazání používaných uzlů.\n"
-#~ "Opravdu chcete pokračovat?"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Nelze vzít zpět příkaz ''{0}'' protože vrstva ''{1}'' již neexistuje"
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "Parametr ''{0}'' nesmí být prázdný"
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "očekáváno id >= 0. Nalezeno {0}"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr "parametr ''{0}'' očekáván v rozsahu 0..{1}, zadáno {2}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "očekáván parameter ''{0}'' > 0, zadáno ''{1}''"
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "aktuální parametr je mimo rozsah: zadáno {0}"
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "neočekávaný index sloupce. Zadáno {0}"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "Parametr 'col'  musí být 0 nebo 1. Zadáno {0}"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "parametr ''{0}'' nesmí být prázdný"
-
-#~ msgid "Dialog not created yet. Invoke createInstance() first"
-#~ msgstr "Dialog nebyl zatím vytvořen. Zavolejte nejprve createInstance()"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Konflikty v datech"
-
-#~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
-#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
-#~ "the new role?</html>"
-#~ msgstr ""
-#~ "<html>Nastavil jste prázdnou roli pro {0} prvků.<br>To je totéž jako "
-#~ "smazání role těchto prvků.<br>Opravdu chcete novou roli aplikovat?</html>"
-
-#~ msgid "Value of child.getId() > 0 expected. Got {1}."
-#~ msgstr "očekáváno child.getId() >0. Nalezeno {1}"
-
-#~ msgid "Object id > 0 expected. Got {0}"
-#~ msgstr "Očekáváno id objektu > 0. Nalezeno {0}"
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "No data imported."
+#~ msgstr "Nic nebylo importováno"
+
+#~ msgid "Data Layer"
+#~ msgstr "Vrstva dat"
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Prosím zvol aspoň jeden úkol ke stažení"
+
+#~ msgid "JOSM Online Help"
+#~ msgstr "JOSM Online Nápověda"
+
+#~ msgid "Open in Browser"
+#~ msgstr "Otevřít v prohlížeči"
+
+#~ msgid "unnamed"
+#~ msgstr "nepojmenováno"
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Neznámá přípona souboru."
+
+#~ msgid "Downloading..."
+#~ msgstr "Stahuji..."
+
+#~ msgid "Change"
+#~ msgstr "Změnit"
+
+#~ msgid "Rotate"
+#~ msgstr "Otočit"
+
+#~ msgid "Move"
+#~ msgstr "Přesunout"
+
+#~ msgid "false"
+#~ msgstr "nepravda"
+
+#~ msgid "true"
+#~ msgstr "pravda"
+
+#~ msgid "different"
+#~ msgstr "různé"
+
+#~ msgid "position"
+#~ msgstr "pozice"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "their version:"
+#~ msgstr "verze na serveru:"
+
+#~ msgid "resolved version:"
+#~ msgstr "finální verze:"
+
+#~ msgid "my version:"
+#~ msgstr "moje verze:"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
+
+#~ msgid "Revert"
+#~ msgstr "Vrátit zpět"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Neuložené změny"
+
+#~ msgid "Delete the selected layer."
+#~ msgstr "Smazat označenou vrstvu."
+
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr "Můžete použít kolečko myši nebo Ctrl+Šipky ke zvětšení či posunu"
+
+#~ msgid "Read GPX..."
+#~ msgstr "Číst GPX..."
+
+#~ msgid "GPS start: {0}"
+#~ msgstr "Start GPS: {0}"
+
+#~ msgid "current delta: {0}s"
+#~ msgstr "nynější odchylka: {0}s"
+
+#~ msgid "GPS end: {0}"
+#~ msgstr "Konec GPS: {0}"
 
 #~ msgid "image"
@@ -29865,106 +30453,4 @@
 #~ msgstr[2] "obrázky"
 
-#~ msgid "Illegal value for attribute ''uid''. Got ''{0}''."
-#~ msgstr "Neplatná hodnota pro atribut ''uid''. Nalezeno ''{0}''"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-#~ msgstr "očekáván parameter ''{0}'' >= 0, zadáno ''{1}''"
-
-#~ msgid "Expected value > 0 for parameter ''{0}'', got {1}"
-#~ msgstr "Očekávaná hodnota > 0 pro parametr ''{0}'', nalezeno {1}"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "Plugin {0} požaduje aktualizaci JOSM na verzi {1}."
-
-#~ msgid "<html>"
-#~ msgstr "<html>"
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "No data imported."
-#~ msgstr "Nic nebylo importováno"
-
-#~ msgid "Data Layer"
-#~ msgstr "Vrstva dat"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Prosím zvol aspoň jeden úkol ke stažení"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM Online Nápověda"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Otevřít v prohlížeči"
-
-#~ msgid "unnamed"
-#~ msgstr "nepojmenováno"
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Neznámá přípona souboru."
-
-#~ msgid "Downloading..."
-#~ msgstr "Stahuji..."
-
-#~ msgid "Change"
-#~ msgstr "Změnit"
-
-#~ msgid "Rotate"
-#~ msgstr "Otočit"
-
-#~ msgid "Move"
-#~ msgstr "Přesunout"
-
-#~ msgid "false"
-#~ msgstr "nepravda"
-
-#~ msgid "true"
-#~ msgstr "pravda"
-
-#~ msgid "different"
-#~ msgstr "různé"
-
-#~ msgid "position"
-#~ msgstr "pozice"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "their version:"
-#~ msgstr "verze na serveru:"
-
-#~ msgid "resolved version:"
-#~ msgstr "finální verze:"
-
-#~ msgid "my version:"
-#~ msgstr "moje verze:"
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
-
-#~ msgid "Revert"
-#~ msgstr "Vrátit zpět"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Neuložené změny"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Smazat označenou vrstvu."
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr "Můžete použít kolečko myši nebo Ctrl+Šipky ke zvětšení či posunu"
-
-#~ msgid "Read GPX..."
-#~ msgstr "Číst GPX..."
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "Start GPS: {0}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "nynější odchylka: {0}s"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "Konec GPS: {0}"
-
 #~ msgid "timezone difference: "
 #~ msgstr "rozdíl časových pásem: "
@@ -30008,7 +30494,4 @@
 #~ msgid "Images for {0}"
 #~ msgstr "Obrázky pro {0}"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Zadaný čas nemůže být rozparsován"
 
 #~ msgid "name"
@@ -30047,4 +30530,13 @@
 #~ msgid "All the ways were empty"
 #~ msgstr "Všechny cesty byli prázdné"
+
+#~ msgid "Boat"
+#~ msgstr "Loď"
+
+#~ msgid "Motorboat"
+#~ msgstr "Motorová loď"
+
+#~ msgid "Cycleway"
+#~ msgstr "Cyklostezka"
 
 #~ msgid "Shop"
@@ -30223,7 +30715,4 @@
 #~ msgid "Only one node selected"
 #~ msgstr "Vybrán pouze jeden uzel"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Vyberte cesty s téměř pravými úhly pro ortogonalizaci."
 
 #~ msgid "All images"
@@ -30450,4 +30939,13 @@
 #~ "{1}"
 
+#~ msgid ""
+#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
+#~ "This can lead to nodes being deleted accidentally.\n"
+#~ "Are you really sure to continue?"
+#~ msgstr ""
+#~ "Zvolené cesty mají uzly mimo hranice stažené oblasti.\n"
+#~ "Toto může vést k nechtěnému smazání používaných uzlů.\n"
+#~ "Opravdu chcete pokračovat?"
+
 #~ msgid "Continue anyway"
 #~ msgstr "Přesto pokračovat"
@@ -30473,7 +30971,4 @@
 #~ msgstr "Při zvolení budou vaše trasy veřejné na openstreetmap.org"
 
-#~ msgid "Public"
-#~ msgstr "Veřejné"
-
 #~ msgid "Please select some data"
 #~ msgstr "Vyberte nějaká data"
@@ -30484,7 +30979,4 @@
 #~ msgid "Please choose a user using the author panel"
 #~ msgstr "Vyberte uživatele v panelu autorů"
-
-#~ msgid "Station"
-#~ msgstr "Stanice"
 
 #~ msgid "Edit Station"
@@ -30624,4 +31116,19 @@
 #~ msgstr "Základní URL OSM serveru (REST API)"
 
+#~ msgid "Edit Track of grade 2"
+#~ msgstr "Upravit vozovou cestu stupně 2"
+
+#~ msgid "Edit Track of grade 4"
+#~ msgstr "Upravit vozovou cestu stupně 4"
+
+#~ msgid "Edit Track of grade 3"
+#~ msgstr "Upravit vozovou cestu stupně 3"
+
+#~ msgid "Edit Track of grade 1"
+#~ msgstr "Upravit vozovou cestu stupně 1 (zpevněnou)"
+
+#~ msgid "Edit Track of grade 5"
+#~ msgstr "Upravit vozovou cestu stupně 5 (nejhorší)"
+
 #~ msgid "Map Type"
 #~ msgstr "Typ mapy"
@@ -30655,4 +31162,25 @@
 #~ msgstr "Editovat turistické informační centrum"
 
+#~ msgid "Edit Demanding Mountain Hiking"
+#~ msgstr "Editovat náročnou horskou stezku"
+
+#~ msgid "Edit Hiking"
+#~ msgstr "Editovat turistickou stezka"
+
+#~ msgid "Mountain Hiking"
+#~ msgstr "horská turistická stezka"
+
+#~ msgid "Edit Mountain Hiking"
+#~ msgstr "Editovat horskou stezka"
+
+#~ msgid "Edit Demanding Alpine Hiking"
+#~ msgstr "Editovat náročnou vysokohorskou stezku"
+
+#~ msgid "Edit Alpine Hiking"
+#~ msgstr "Editovat vysokohorskou stezku"
+
+#~ msgid "Edit Difficult Alpine Hiking"
+#~ msgstr "Upravit obtížnou vysokohorskou stezku"
+
 #~ msgid "No images with readable timestamps found."
 #~ msgstr "Nebyli nalezeny žádné obrázky s čitelnou časovou značkou."
@@ -30670,7 +31198,4 @@
 #~ msgid "Board Type"
 #~ msgstr "Typ nástěnky"
-
-#~ msgid "board"
-#~ msgstr "obecná nástěnka"
 
 #~ msgid ""
@@ -30698,7 +31223,4 @@
 #~ "Hlavní předností tohoto pluginu je možnost smazat body z GPX trasy. Tento "
 #~ "plugin může být použit pro přípravu tras pro uploud do OSM."
-
-#~ msgid "Interpolation"
-#~ msgstr "Interpolace"
 
 #~ msgid "Optional"
@@ -30845,4 +31367,7 @@
 #~ msgstr "<html>Selhalo nahrávání historie ze serveru. Detaily:<br>{0}</html>"
 
+#~ msgid "Conflicts in data"
+#~ msgstr "Konflikty v datech"
+
 #~ msgid "Login name (e-mail) to the OSM account."
 #~ msgstr "Přihlašovací jméno (e-mail) k účtu OSM."
@@ -30856,4 +31381,7 @@
 #~ msgid "The XML source (URL or filename) for {0} definition files."
 #~ msgstr "XML zdroj (URL nebo název souboru) pro {0} definiční soubory."
+
+#~ msgid "Plugin {0} requires JOSM update to version {1}."
+#~ msgstr "Plugin {0} požaduje aktualizaci JOSM na verzi {1}."
 
 #~ msgid "More details"
@@ -30922,4 +31450,7 @@
 #~ "html>"
 
+#~ msgid ">"
+#~ msgstr ">"
+
 #~ msgid "Version number missing from OSM data"
 #~ msgstr "V OSM datech chybí číslo verze"
@@ -30952,4 +31483,12 @@
 #~ msgstr "Mazání vrstvy {0} z {1}"
 
+#~ msgid ""
+#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
+#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
+#~ "the new role?</html>"
+#~ msgstr ""
+#~ "<html>Nastavil jste prázdnou roli pro {0} prvků.<br>To je totéž jako "
+#~ "smazání role těchto prvků.<br>Opravdu chcete novou roli aplikovat?</html>"
+
 #~ msgid "Linked"
 #~ msgstr "Spojený"
@@ -30957,4 +31496,7 @@
 #~ msgid "Plug-in named {0} is not available. Update skipped."
 #~ msgstr "Plug-in {0} je nedostupný. Aktualizace přeskočena."
+
+#~ msgid "The plugin could not be removed. Probably it was already disabled"
+#~ msgstr "Plugin nelze odstranit. Pravděpodobně je již neaktivní."
 
 #~ msgid "AgPifoJ - Geotagged pictures"
@@ -31021,4 +31563,7 @@
 #~ msgstr "Zkopírovat výchozí hodnoty"
 
+#~ msgid "<html>"
+#~ msgstr "<html>"
+
 #~ msgid "Reached the end of the line"
 #~ msgstr "Dosažen konec cesty"
@@ -31051,7 +31596,21 @@
 #~ "nebo  <A HREF=\"{1}\">ve tvém jazyce</A>."
 
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "parametr ''{0}'' nesmí být null"
+
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr ""
+#~ "byla očekávána instance OsmDataLayer nebo GpxLayer, ale ve skutečnosti "
+#~ "je: ''{0}''."
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "Neočekávaná návratová hodnota. Navráceno {0}"
 
+#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "očekáván parameter ''{0}'' > 0, zadáno ''{1}''"
+
+#~ msgid "Expected ID >= 0. Got {0}."
+#~ msgstr "očekáváno id >= 0. Nalezeno {0}"
+
 #~ msgid "There's no primitive with version {0} in this history."
 #~ msgstr "V historii není žádný prvek s verzí {0}"
@@ -31060,4 +31619,7 @@
 #~ msgstr "V historii není žádná verze platná k datu ''{0}''"
 
+#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
+#~ msgstr "parametr ''{0}'' očekáván v rozsahu 0..{1}, zadáno {2}"
+
 #~ msgid "No earliest version found. History is empty."
 #~ msgstr "nenalezena starší verze. Historie je prázdná."
@@ -31066,9 +31628,27 @@
 #~ msgstr "nenalezena novější verze. Historie je prázdná."
 
+#~ msgid "Parameter current out of range. Got {0}."
+#~ msgstr "aktuální parametr je mimo rozsah: zadáno {0}"
+
+#~ msgid "Unexpected column index. Got {0}."
+#~ msgstr "neočekávaný index sloupce. Zadáno {0}"
+
+#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
+#~ msgstr "Parametr 'col'  musí být 0 nebo 1. Zadáno {0}"
+
+#~ msgid "Parameter ''{0}'' must not be empty."
+#~ msgstr "parametr ''{0}'' nesmí být prázdný"
+
 #~ msgid "Display the history of the selected primitive."
 #~ msgstr "Zobrazit historii vybraného prvku"
 
+#~ msgid "Value of child.getId() > 0 expected. Got {1}."
+#~ msgstr "očekáváno child.getId() >0. Nalezeno {1}"
+
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Nemůžu číst \"{0}\""
+
+#~ msgid "Illegal value for attribute ''uid''. Got ''{0}''."
+#~ msgstr "Neplatná hodnota pro atribut ''uid''. Nalezeno ''{0}''"
 
 #~ msgid ""
@@ -31083,4 +31663,18 @@
 #~ "nedovolená hodnota povinného atributu ''{0}'' typu int (>=0), zadáno "
 #~ "''{1}''"
+
+#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
+#~ msgstr "očekáván parameter ''{0}'' >= 0, zadáno ''{1}''"
+
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "Parametr ''{0}'' nesmí být null"
+
+#~ msgid "Id > 0 required, got {0}"
+#~ msgstr "Očekáváno Id > 0, zadáno {0}"
+
+#~ msgid ""
+#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
+#~ msgstr ""
+#~ "Nelze vzít zpět příkaz ''{0}'' protože vrstva ''{1}'' již neexistuje"
 
 #~ msgid ""
@@ -31097,4 +31691,10 @@
 #~ msgstr "Nepodařilo se spustit externí prohlížeč"
 
+#~ msgid "Dialog not created yet. Invoke createInstance() first"
+#~ msgstr "Dialog nebyl zatím vytvořen. Zavolejte nejprve createInstance()"
+
+#~ msgid "Object id > 0 expected. Got {0}"
+#~ msgstr "Očekáváno id objektu > 0. Nalezeno {0}"
+
 #~ msgid "Use an open changeset"
 #~ msgstr "Použít otevřenou sadu změn"
@@ -31111,4 +31711,7 @@
 #~ msgid "Help / About"
 #~ msgstr "Nápověda / O programu"
+
+#~ msgid "Parameter ''{0}'' must not be empty"
+#~ msgstr "Parametr ''{0}'' nesmí být prázdný"
 
 #~ msgid "{0} Plugin successfully downloaded."
@@ -31125,7 +31728,31 @@
 #~ msgstr "Vyhledávám dostupné překlady ..."
 
+#~ msgid "Expected value > 0 for parameter ''{0}'', got {1}"
+#~ msgstr "Očekávaná hodnota > 0 pro parametr ''{0}'', nalezeno {1}"
+
 #~ msgid "Please restart JOSM."
 #~ msgstr "Prosím restartujte JOSM."
 
+#~ msgid "Footway"
+#~ msgstr "Chodník, stezka pro chodce"
+
+#~ msgid "Bridleway"
+#~ msgstr "Hypostezka, stezka pro koně"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "Lesní/polní cesta kvalita 3"
+
+#~ msgid "Track Grade 2"
+#~ msgstr "Lesní/polní cesta kvalita 2"
+
+#~ msgid "Track Grade 1"
+#~ msgstr "Lesní/polní cesta kvalita 1 (zpevněná)"
+
+#~ msgid "Track Grade 5"
+#~ msgstr "Lesní/polní cesta kvalita 5 (nejhorší)"
+
+#~ msgid "Track Grade 4"
+#~ msgstr "Lesní/polní cesta kvalita 4"
+
 #~ msgid "At least one object to delete requird, got empty collection"
 #~ msgstr "Pro mazání je třeba vybrat alespoň jeden objekt, nemáte nic vybráno"
Index: applications/editors/josm/i18n/po/da.po
===================================================================
--- applications/editors/josm/i18n/po/da.po	(revision 19689)
+++ applications/editors/josm/i18n/po/da.po	(revision 19698)
@@ -9,7 +9,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-19 00:01-0500\n"
-"PO-Revision-Date: 2010-01-18 23:31-0500\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-30 12:49+0000\n"
+"Last-Translator: nanker <Unknown>\n"
 "Language-Team: Dansk <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-13 18:26+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -71,11 +71,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -242,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -254,13 +254,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -269,5 +269,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -293,5 +296,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Sammenflet"
@@ -322,5 +325,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -387,9 +390,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -397,5 +400,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "OK"
@@ -446,6 +451,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -463,5 +468,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -470,11 +475,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -511,5 +516,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "konflikt"
@@ -643,14 +648,14 @@
 msgstr "Vælg mindst to veje at kombinere."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Kopier"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Kopier valgte objekter til udklipsholderen."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Vælg venligst noget at kopiere."
@@ -683,8 +688,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -693,5 +698,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -748,16 +753,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Der var {0} konflikter under importen."
-msgstr[1] "Der var {0} konflikter under importen."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "Konflikter under download"
-msgstr[1] "Konflikter under download"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -778,4 +782,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -785,4 +791,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplikér markering ved kopiering og umiddelbar indsættelse"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Dupliker vej"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "Rediger den nu markerede relation"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "Lag: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "Zoom til {0}"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr ""
 
 #. <button label="Info" hotkey="I">
@@ -873,10 +907,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 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] "Den valgte vej indeholder ikke det valgte punkt."
-msgstr[1] "Den valgte vej indeholder ikke alle valgte punkter."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -997,5 +1030,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "URL"
@@ -1147,5 +1180,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+#, fuzzy
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr "<html>Kan ikke åbne mappe.<br>Vælg venligst en fil!"
 
@@ -1159,8 +1193,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Åbner {0} filer..."
+msgstr[0] "Åbner {0} fil..."
 msgstr[1] "Åbner {0} filer..."
 
@@ -1184,7 +1218,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
-#, fuzzy
 msgid "Select if the data should be downloaded into a new layer"
-msgstr "Vælg om data skal downloades til et nyt lag"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
@@ -1218,7 +1251,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1232,5 +1265,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "Flyt punkter så alle vinkler er 90 eller 270 grader"
 
@@ -1272,4 +1306,8 @@
 "fortsætte?</html>"
 
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+msgid "Selection must consist only of ways and nodes."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
 msgid "Orthogonalize"
@@ -1284,4 +1322,15 @@
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "De valgte elementer kan ikke retvinkles"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr "Vælg venligst veje med næsten rette vinkler at gøre retvinklet."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1298,9 +1347,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151
 msgid "Delete incomplete members?"
-msgstr ""
+msgstr "Slet ufuldstændige medlemmer?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152
 msgid "Paste without incomplete members"
-msgstr ""
+msgstr "Indsæt uden ufuldstændige medlemmer"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
@@ -1310,4 +1359,7 @@
 "incomplete primitives?"
 msgstr ""
+"De kopierede data indeholder ufuldstændige primitiver. Ved indsætning bliver "
+"de ufuldstændige primitiver fjernet. Ønsker du at indsætte dataene uden de "
+"ufuldstændige primitiver?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
@@ -1387,18 +1439,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1423,12 +1475,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Fejl"
@@ -1562,5 +1615,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1767,9 +1820,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "Nar {0} punkter ind i {1} punkter"
-msgstr[1] "Nar {0} punkter ind i {1} punkter"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1813,5 +1866,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr "Download data"
@@ -2230,5 +2283,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:29
 msgid "Drag play head"
-msgstr ""
+msgstr "Træk spillehoved"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
@@ -2243,6 +2296,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2325,7 +2378,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
-#, fuzzy
 msgid "<not>"
-msgstr "nord"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
@@ -2338,7 +2390,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
-#, fuzzy
 msgid "<right parent>"
-msgstr "Manglende højre parantes"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
@@ -2368,5 +2419,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Søg efter objekter."
@@ -2569,5 +2620,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Søg"
@@ -2607,5 +2658,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
@@ -2613,5 +2664,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
@@ -2619,10 +2670,10 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
 msgstr "Regulært udtryk"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2636,9 +2687,9 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr "Nøgle kan ikke være tom når tag operatør bruges. Eksempel: nøgle=værdi"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2661,7 +2712,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
-msgstr "Uventet symbol: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
@@ -2783,8 +2834,8 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "Tilføjede {0} objekter"
+msgstr[0] "Tilføjede {0} objekt"
 msgstr[1] "Tilføjede {0} objekter"
 
@@ -2835,12 +2886,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "Fjern \"{0}\" for {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Sæt {0}={1} for {2} {3}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2904,17 +2955,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Slette-tilstand"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Slet {0} vej"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Slet {0} relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2995,9 +3046,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "Udrensede {0} objekter"
-msgstr[1] "Udrensede {0} objekter"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -3047,24 +3098,24 @@
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "Undelete {0} primitive"
 msgid_plural "Undelete {0} primitives"
-msgstr[0] "Gendan {0} primitiver"
-msgstr[1] "Gendan {0} primitiver"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for node {0}"
-msgstr "Løs versions konflikter for punkt {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for way {0}"
-msgstr "Løs versions konflikter for vej {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Løs versions konflikter for relation {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3333,5 +3384,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3339,5 +3390,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3345,5 +3396,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3351,5 +3402,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3424,8 +3475,7 @@
 #. column header: hide filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
-#, fuzzy
 msgctxt "filter"
 msgid "H"
-msgstr "H"
+msgstr ""
 
 #. column header: filter text
@@ -3437,67 +3487,60 @@
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "C"
+msgstr ""
 
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
-#, fuzzy
 msgctxt "filter"
 msgid "I"
-msgstr "I"
+msgstr ""
 
 #. column header: filter mode
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
-#, fuzzy
 msgctxt "filter"
 msgid "M"
-msgstr "M"
+msgstr ""
 
 #. translators notes must be in front
 #. filter mode: replace
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210
-#, fuzzy
 msgctxt "filter"
 msgid "R"
-msgstr "R"
+msgstr ""
 
 #. filter mode: add
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211
-#, fuzzy
 msgctxt "filter"
 msgid "A"
-msgstr "A"
+msgstr ""
 
 #. filter mode: remove
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212
-#, fuzzy
 msgctxt "filter"
 msgid "D"
-msgstr "D"
+msgstr ""
 
 #. filter mode: in selection
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213
-#, fuzzy
 msgctxt "filter"
 msgid "F"
-msgstr "F"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "En primitiv med ID = 0 kan ikke være usynlig."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "ID > 0 forventet. Fik {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "Version > 0 forventet. Fik {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3508,5 +3551,5 @@
 "er {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3514,5 +3557,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3640,6 +3683,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3649,5 +3692,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3658,7 +3701,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3680,5 +3723,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "baggrund"
@@ -3824,6 +3867,6 @@
 msgstr "Vis ikke igen (husker valg)"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3831,37 +3874,38 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "ufuldstændig"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "landevej"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "jernbane"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "vandvej"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "brug af jord"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3870,10 +3914,10 @@
 msgstr[1] "{0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr "Offentlig transport"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3882,5 +3926,5 @@
 msgstr[1] "{0} medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3917,6 +3961,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Konflikt"
@@ -3927,5 +3971,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-msgid "Authorization Failed"
+msgid "Authorisation Failed"
 msgstr "Autorisation fejlede"
 
@@ -4131,8 +4175,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Make sure you load some data if you use --selection."
-msgstr ""
+msgstr "Vær sikker på at du indlæser nogle data hvis du bruger --selection."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Initialiserer"
@@ -4140,9 +4183,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
 msgid "Updating plugins..."
-msgstr ""
+msgstr "Opdaterer plugins..."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:176
 msgid "Installing updated plugins"
-msgstr ""
+msgstr "Installerer opdaterede plugins"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:180
@@ -4173,5 +4216,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4182,5 +4225,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Redigér"
@@ -4251,29 +4294,29 @@
 msgstr "skalér"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Den geografiske længdegrad ved musemarkøren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 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:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Den geografiske breddegrad ved musemarkøren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 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:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 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:106
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 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:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4283,9 +4326,9 @@
 "liste med musen.<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(intet objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4452,16 +4495,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Tags ({0} konflikter)"
-msgstr[1] "Tags ({0} konflikter)"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "{0} pending tag conflict to be resolved"
 msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} uafklarede tagkonflikter der skal løses"
-msgstr[1] "{0} uafklarede tagkonflikter der skal løses"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
@@ -4520,16 +4563,16 @@
 msgstr "Konflikt-løsning"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr "Liste i rolle {0} deltager ikke i et sammenligningspar."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "Uventet værdi af parameter \"indeks\". Fik {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4749,8 +4792,13 @@
 msgstr "Punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 "Sammenlagte punkter ikke frosset endnu. Kan ikke opbygge resolutionskommando."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4777,5 +4825,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional node used by way {1}<br>which is deleted on the "
@@ -4785,9 +4833,5 @@
 "server.<br><br>Do you want to undelete these nodes too?"
 msgstr[0] ""
-"<html>Der er {0} yderligere punkter, som benyttes af vejen {1}<br>som er "
-"slettet på serveren.<br><br>Ønsker du også at gendanne disse punkter?</html>"
 msgstr[1] ""
-"<html>Der er {0} yderligere punkter, som benyttes af vejen {1}<br>som er "
-"slettet på serveren.<br><br>Ønsker du også at gendanne disse punkter?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
@@ -4796,5 +4840,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional primitive referred to by relation {1}<br>which is "
@@ -4804,11 +4848,5 @@
 "deleted on the server.<br><br>Do you want to undelete these too?"
 msgstr[0] ""
-"<html>Der er {0} flere primitiver som relation {1} refererer til<br>og som "
-"er slettet på serveren.<br><br>Ønsker du at omgøre sletningen af dem også?</"
-"html>"
 msgstr[1] ""
-"<html>Der er {0} flere primitiver som relation {1} refererer til<br>og som "
-"er slettet på serveren.<br><br>Ønsker du at omgøre sletningen af dem også?</"
-"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
@@ -4911,5 +4949,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr "Nej, afbryd"
@@ -4960,5 +4998,10 @@
 msgstr "Primitiv"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -5089,10 +5132,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "intet"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "alle"
@@ -5173,7 +5216,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -5183,6 +5226,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5385,10 +5428,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5408,13 +5451,13 @@
 msgstr "Kommando-stak: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr "Løs konfilkter."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Løs"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
@@ -5422,6 +5465,6 @@
 "liste."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5456,5 +5499,5 @@
 "<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.Click <strong>{0}</strong> to close anyway."
+"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.</"
@@ -5480,5 +5523,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5487,5 +5530,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5565,43 +5608,48 @@
 msgstr "Vis de markerede objekters historik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 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:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr "Slet de markerede lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Vis/skjul"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr "Aktivér"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr "Aktiver de markerede lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 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:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Dupliker vej"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 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:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Flyt det valgte lag en række ned."
@@ -5615,6 +5663,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Relationer"
@@ -5624,22 +5672,22 @@
 msgstr "Åbn en liste over alle relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relationer: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Åbn en editor for den valgte relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Slet de nvalgte relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Opret en ny relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
@@ -5647,47 +5695,47 @@
 "Opret en kopi af denne relation og åbn den i et andet redigeringsvindue"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr "Sæt den nuværende markering til listen over markerede relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr "Marker medlemmerne af alle markerede relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr "Vælg medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr "Download alle medlemmer af de markerede relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr "Download medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Aktuel markering"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Åbn et vindue med en markeringsliste."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Zoom til markerede element(er)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Zoom til markering"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Valgt: Rel.:{0} / Veje:{1} / Punkter:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5695,5 +5743,5 @@
 msgstr "Markering"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -6055,8 +6103,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -6128,4 +6174,7 @@
 #. <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 />
@@ -6204,6 +6253,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6245,6 +6295,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6713,152 +6765,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Navn"
@@ -7272,5 +7326,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<forskellige>"
@@ -7325,55 +7379,55 @@
 msgstr "Tilføj egenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaber: {0} / Medlemskaber: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Egenskaber / Medlemskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Skift relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "Slet fra relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Slet virkelig det markerede fra relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Fjern den valgte nøgle i alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "Fjern egenskaber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Tilføj et nyt nøgle/værdi-sæt til alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Ret værdien for den valgte nøgle for alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr "Markér relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr "Vælg relation i hovedmarkering."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr "Markér i relationsliste"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr "Markér relation i relationsliste."
@@ -7409,9 +7463,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1093
-#, fuzzy
 msgid "Conflict in data"
 msgid_plural "Conflicts in data"
 msgstr[0] "Konflikt i data"
-msgstr[1] "Konflikt i data"
+msgstr[1] "Konflikter i data"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:345
@@ -7728,7 +7781,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
-#, fuzzy
 msgid "Do you really want to apply the new role?"
-msgstr "Vil du tillade dette?"
+msgstr "Vil du virkelig anvende den nye rolle?"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
@@ -7824,9 +7876,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr ""
-"Advarsel: Ignorerer undtagelse fordi opgave blev annulleret. Undtagelse var: "
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
@@ -7846,30 +7897,30 @@
 msgstr "vej er ikke forbundet til foregående eller næste relationsmedlem"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Bogmærker"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr "<html>Der er ikke markeret noget område at downloade.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+#, fuzzy
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
 msgstr ""
 "<html><strong>Nuværende downloadområde</strong> (minlat, minlon, maxlat, "
 "maxlon): {0}, {1}, {2}, {3}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr "Opret bogmærke"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:185
 msgid "Add a bookmark for the currently selected download area"
 msgstr "Tilføj et bogmærke for det nu markerede downloadområde"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:192
 msgid ""
 "Currently, there is no download area selected. Please select an area first."
@@ -7878,19 +7929,19 @@
 "først."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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 "Indtast venligst et navn for det bogmærkede downloadområde."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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 "Navn på sted"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:217
 msgid "Remove the currently selected bookmarks"
 msgstr "Fjern de nu markerede bogmærker"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr "Omdøb det markerede bogmærke"
@@ -8021,18 +8072,18 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr "Klassetype"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr "Afgrænsninger"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr "Nær"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -8043,34 +8094,34 @@
 msgstr "Vælg server for søgning:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
 msgid "Enter a place name to search for:"
 msgstr "Indtast et stednavn at søge efter:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:112
 msgid "Enter a place name to search for"
 msgstr "Indtast et stednavn at søge efter"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:148
 msgid "Areas around places"
 msgstr "Områder omkring steder"
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Null pointer-fejl, sikkert på grund af nogle manglende tags."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr "Søg ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr "Klik for at begynde søgning efter steder"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr "Forespørger på navneserver"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr "Forespørger på navneserver ..."
@@ -8081,7 +8132,9 @@
 #. 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" />
@@ -8090,10 +8143,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Type"
@@ -8102,5 +8156,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -8112,17 +8166,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "ukendt"
@@ -8246,7 +8299,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511
-#, fuzzy, java-format
+#, java-format
 msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr "Advarsel: Dårligt sted i HTML dokument. Undtagelse var: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561
@@ -8490,5 +8543,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr "Konflikter opdaget"
@@ -8879,5 +8932,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>{0} layer needs saving but has an associated file<br>which cannot be "
@@ -8889,11 +8942,5 @@
 "changes.<br>Layers with non-writable files:</html>"
 msgstr[0] ""
-"<html>{0} lag bør gemmes, men har en tilknyttet fil<br> som ikke kan skrives."
-"<br>Vælg enten en anden fil til dette lag eller kassér ændringerne.<br>Lag "
-"med en ikke-skrivbar fil:</html>"
 msgstr[1] ""
-"<html>{0} lag bør gemmes, men har en tilknyttet fil<br> som ikke kan skrives."
-"<br>Vælg enten en anden fil til hver af dem eller kassér ændringerne.<br>Lag "
-"med ikke-skrivbare filer:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
@@ -8943,5 +8990,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -8951,9 +8998,5 @@
 "cancelled or have failed.</html>"
 msgstr[0] ""
-"<html>En upload og/eller gemme operation af et lag med ændringer<br>blev "
-"annulleret eller er mislykkedes.</html>"
 msgstr[1] ""
-"<html>En upload og/eller gemme operation af et lag med ændringer<br>blev "
-"annulleret eller er mislykkedes.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500
@@ -8976,9 +9019,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8988,7 +9031,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -9000,16 +9043,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "Lag"
@@ -9151,5 +9194,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58
 msgid "configure changeset"
-msgstr ""
+msgstr "konfigurér rettesæt"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80
@@ -9190,5 +9233,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:101
 msgid "advanced configuration"
-msgstr ""
+msgstr "avanceret konfiguration"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97
@@ -9462,68 +9505,68 @@
 msgstr[1] "{0} objekter at slette:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "gps-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Tilpas linjetegning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../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:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Tilpas farve"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../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:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr "Markører fra navngivne punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Navngivne punkter fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Importér lyd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9536,23 +9579,23 @@
 "af hvordan de hænger sammen med lyddata.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr "Import er ikke mulig"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-lydfiler (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Lyd-markører fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Importér billeder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9565,5 +9608,5 @@
 "af hvordan de hænger sammen med billeder.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9571,5 +9614,5 @@
 msgstr "Navn: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9577,5 +9620,5 @@
 msgstr "Beskrivelse: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9585,23 +9628,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr "Tidsrum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr "Længde"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Længde: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9610,5 +9653,5 @@
 msgstr[1] "{0} ruter, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9617,10 +9660,10 @@
 msgstr[1] "{0} punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Konvertér til datalag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9630,43 +9673,43 @@
 "<br>Hvis du vil uploade traces, så kig her:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Konverteret fra: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "Download fra OSM langs dette spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Download alt indenfor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "Maksimum område per anmodning:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9677,10 +9720,10 @@
 "du<br>at fortsætte?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 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:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9690,5 +9733,5 @@
 "blev udeladt eller flyttet til starten."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9698,23 +9741,23 @@
 "estimere deres tid blev udeladt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datalag {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "Uden for det downloadede område"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr "version {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 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:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9723,5 +9766,5 @@
 msgstr[1] "Der blev opdaget {0} konflikter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9739,5 +9782,5 @@
 "{0} objekter<br>fra det lokale datasæt fordi de er slettet på serveren."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9754,11 +9797,11 @@
 "konfliktlistedialogen og løs dem manuelt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 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:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9767,32 +9810,32 @@
 msgstr[1] "{0} slettet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} består af:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr "nulstil"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr "API-version: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Konvertér til GPX-lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr "Datasætskonsistenstest"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr "Fandt ingen problemer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr "Følgende problemer blev fundet:"
@@ -9841,28 +9884,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "GPS-punkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX-filer (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, 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:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Fejl under fortolkning af {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Kunne ikke læse \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9874,34 +9916,34 @@
 "vælg en tidszone<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr "Tidspunkt for foto (fra EXIF):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 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:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/åååå tt:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr "Jeg er i tidszonen: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "Ingen dato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr "Åbn et andet foto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 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:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9911,21 +9953,21 @@
 "Brug venligst det angivne format"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "Ugyldig dato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr "<Intet GPX-spor er indlæst endnu>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr "GPX-spor: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr "Åbn endnu et GPX-spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
@@ -9933,91 +9975,91 @@
 "<html>Brug foto af et nøjagtigt ur,<br>f.eks. GPSmodtagerdisplay</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr "Manuel justering"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr "Underkend position for: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, 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:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, 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:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr "Vis miniaturebilleder på kortet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr "Tidszone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr "Forskydning:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr "Ingen gpx valgt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
+#, 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>Afstemte <b>{0}</b> af <b>{1}</b> fotos med GPX-spor.</html>"
-msgstr[1] "<html>Afstemte <b>{0}</b> af <b>{1}</b> fotos med GPX-spor.</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr "Afstem billeder med GPX-spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr "Sammenhold"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr "Ugyldig tidszone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr "Ugyldig forskydning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr "Prøv igen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr "Ingen billeder kunne afstemmes!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Tidszone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutter: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekunder: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10026,5 +10068,5 @@
 msgstr[1] "Tidsforskel for {0} dage"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10034,21 +10076,21 @@
 "kan justere gliderne for manuelt at afstemme fotoene."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 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:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr "Justér tidszone og forskydning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 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:951
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr "Billederne rummer ingen tidsangivelser"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10056,17 +10098,17 @@
 msgstr "Det valgte GPX-spor rummer ikke tidsstempler. Vælg venligst et andet."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr "GPX-sporet har ingen tidsangivelser."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 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:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr "Intet valgt GPX-spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -10077,5 +10119,5 @@
 "Forventet format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -10086,75 +10128,75 @@
 "Forventet format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "Trækker GPS-lokaliteter ud fra EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr "Begynder scanning af mappe"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 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:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "Indlæs billeder..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Indlæser {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, 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:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Tjekker mappen {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, 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:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, 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:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Geotaggede billeder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr "Sammenhold med GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "Intet data indlæst."
-msgstr[1] "Intet data indlæst."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
+#, java-format
 msgid "{0} was found to be GPS tagged."
 msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] "{0} blev fundet, som skal gps-tagges"
-msgstr[1] "{0} blev fundet, som skal gps-tagges"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr "Slet billedfil fra disk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -10165,5 +10207,5 @@
 "h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr "Billedfilen kunne ikke slettes"
@@ -10260,5 +10302,5 @@
 msgstr "GPS-markør"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10266,5 +10308,5 @@
 msgstr[1] "markører"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10273,9 +10315,9 @@
 msgstr[1] "{0} består af {1} markører"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "Synkronisér lyd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10284,20 +10326,20 @@
 "angivelsen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr "Lyd synkroniseret på punkt {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 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:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -10305,17 +10347,17 @@
 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:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 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:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Vis/skjul tekst/ikoner"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 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:171
+#: ../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 "
@@ -10325,5 +10367,5 @@
 "lydspor du spillede (efter den første markør)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -10333,5 +10375,5 @@
 "på sporet hvor du ønsker at synkronisere."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "Kan ikke oprette ny lydmarkør"
@@ -10357,19 +10399,15 @@
 msgstr "Ulovligt streg-mønster. Mindst en værdi skal være over > 0"
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
+#, java-format
 msgid ""
 "Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
 msgstr ""
-"Advarsel: Kunne af sikkerhedsårsager ikke få adgang til mappen ''{0}''. "
-"Undtagelsen var: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
-#, fuzzy, java-format
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
+#, java-format
 msgid ""
 "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
 msgstr ""
-"Advarsel: Kunne af sikkerhedsårsager ikke få adgang til mappen ''{0}''. "
-"Undtagelsen var: {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
@@ -10403,9 +10441,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
 msgid "Consumer Key:"
-msgstr ""
+msgstr "Forbrugernøgle:"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
 msgid "Consumer Secret:"
-msgstr ""
+msgstr "Forbrugerhemmelighed:"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
@@ -10419,15 +10457,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
 msgid "Authorize URL:"
-msgstr "Autorisér nu"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
 msgid "Click to reset the OAuth settings to default values"
-msgstr ""
+msgstr "Klik for at sætte OAuth indstillingerne tilbage til standardværdierne"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
 msgid "Click to abort resetting to the OAuth default values"
-msgstr ""
+msgstr "Klik for at afbryde tilbagestilling til OAuth standardværdier"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
@@ -10436,8 +10473,10 @@
 "current custom settings are not saved.</html>"
 msgstr ""
+"<html>JOSM er ved at sætte OAuth indstillingerne tilbage til standarden."
+"<br>De nuværende brugerdefinerede indstillinger bliver ikke slettet.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
 msgid "Overwrite custom OAuth settings?"
-msgstr ""
+msgstr "Overskriv brugerdefinerede OAuth indstillinger?"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:58
@@ -10723,7 +10762,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437
-#, fuzzy, java-format
+#, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
-msgstr "Henter OAuth anmodningsudtryk fra ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484
@@ -10734,10 +10773,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:486
 msgid "Initializing a session at the OSM website..."
-msgstr ""
+msgstr "Initialiserer en session på OSM-websiden..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:492
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
-msgstr ""
+msgstr "Autentificerer sessionen for bruger ''{0}''..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498
@@ -10749,25 +10788,25 @@
 #, java-format
 msgid "Logging out session ''{0}''..."
-msgstr ""
+msgstr "Logger session ''{0}'' ud..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
 msgid "Allow to upload map data"
-msgstr ""
+msgstr "Tillad at uploade kortdata"
 
 #: ../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 ""
+msgstr "Markér for at give JOSM retten til at uploade kortdata på dine vegne"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
 msgid "Allow to upload GPS traces"
-msgstr ""
+msgstr "Tillad at uploade GPS-spor"
 
 #: ../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 ""
+msgstr "Markér for at give JOSM retten til at uploade GPS-spor på dine vegne"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
 msgid "Allow to download your private GPS traces"
-msgstr ""
+msgstr "Tillad at downloade dine private GPS-spor"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
@@ -10776,20 +10815,22 @@
 "layers"
 msgstr ""
+"Markér for at give JOSM retten til at downloade dine private GPS-spor ind i "
+"JOSM-lag"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
 msgid "Allow to read your preferences"
-msgstr ""
+msgstr "Tillad at læse dine indstillinger"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
 msgid "Select to grant JOSM the right to read your server preferences"
-msgstr ""
+msgstr "Markér for at give JOSM retten til at læse dine serverindstillinger"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
 msgid "Allow to write your preferences"
-msgstr ""
+msgstr "Tillad at skrive dine indstillinger"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
 msgid "Select to grant JOSM the right to write your server preferences"
-msgstr ""
+msgstr "Markér for at give JOSM retten til at skrive dine serverindstillinger"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
@@ -10800,29 +10841,29 @@
 #, java-format
 msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
-msgstr ""
+msgstr "<html>At hente et OAuth adgangsudtryk fra ''{0}'' fejlede.</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 ""
+msgstr "Anmodning fejlede"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
 msgid "Retrieving OAuth Request Token..."
-msgstr ""
+msgstr "Henter OAuth anmodningsudtryk..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
 #, java-format
 msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
-msgstr ""
+msgstr "<html>At hente et OAuth anmodningsudtryk fra ''{0}'' fejlede.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:130
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
 msgid "Display Advanced OAuth Parameters"
-msgstr ""
+msgstr "Vis avancerede OAuth parametre"
 
 #: ../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 ""
+msgstr "Hent anmodningsudtryk"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:163
@@ -10843,5 +10884,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:228
 msgid "Request Access Token"
-msgstr ""
+msgstr "Anmod om Adgangsudtryk"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:220
@@ -10860,5 +10901,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:349
 msgid "Go back to step 1/3"
-msgstr ""
+msgstr "Gå tilbage til trin 1/3"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:292
@@ -10867,5 +10908,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:306
-#, fuzzy
 msgid ""
 "<html>JOSM has successfully retrieved an Access Token. You can now accept "
@@ -10873,23 +10913,20 @@
 "authorization to the OSM server.<br><br>The access token is: </html>"
 msgstr ""
-"<html>Du har med succes hentet et OAuth adgangsudtryk fra OSM-websiden. Klik "
-"på <strong>{0}</strong> for at acceptere udtrykket. JOSM vil bruge det i "
-"fremtidige anmodninger for at få adgang til OSM API'et..</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:348
 msgid "Restart"
-msgstr ""
+msgstr "Genstart"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:371
 msgid "Click to retrieve a Request Token"
-msgstr ""
+msgstr "Klik for at hente et anmodningsudtryk"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:402
 msgid "Retrieve Access Token"
-msgstr ""
+msgstr "Hent adgangsudtryk"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:404
 msgid "Click to retrieve an Access Token"
-msgstr ""
+msgstr "Klik for at hente et adgangsudtryk"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
@@ -10903,7 +10940,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
-#, fuzzy, java-format
+#, java-format
 msgid "Retrieving user details with Access Token Key ''{0}'' was forbidden."
-msgstr "Henter OAuth adgangsudtryk fra ''{0}''"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
@@ -10917,5 +10954,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
 msgid "Success"
-msgstr ""
+msgstr "Succes"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
@@ -10936,5 +10973,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>The Access Token ''{1}'' is known to the OSM server ''{0}''.<br>The "
@@ -10944,13 +10981,8 @@
 "resources.</html>"
 msgstr ""
-"<html>Adgangsudtrykket ''{1}'' er kendt af  OSM serveren ''{0}''.<br>Testen "
-"til at hente dette udtryks brugerdetaljer\r\n"
-" fejlede dog.<br>Afhængigt af hvilke rettigheder der er givet dette udtryk "
-"må du ikke desto mindre bruge det<br>til at uploade data, uploade GPS-spor, "
-"og/eller tilgå andre beskyttede resurser.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
 msgid "Token allows restricted access"
-msgstr ""
+msgstr "Udtryk tillader begrænset adgang"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
@@ -10985,5 +11017,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
 msgid "Retrieving user info..."
-msgstr ""
+msgstr "Henter brugerinfo..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
@@ -11018,5 +11050,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Vælg venligst rækken, der skal rettes."
@@ -11030,5 +11062,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -11181,9 +11213,4 @@
 msgstr "Tegnestil {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "Lag: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -11213,6 +11240,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr "Alle"
@@ -11251,8 +11278,8 @@
 msgstr "Enkelt farve (kan justeres for navngivne lag)"
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Bil"
@@ -11274,13 +11301,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Cykel"
@@ -11313,12 +11340,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "Gående"
@@ -11559,5 +11586,7 @@
 msgid_plural "The following {0} plugins have been downloaded successfully:"
 msgstr[0] ""
+"Den følgende plugin er blevet downloaded <strong>med succes</strong>:"
 msgstr[1] ""
+"De følgende plugins er blevet downloaded <strong>med succes</strong>:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
@@ -11566,14 +11595,14 @@
 msgid_plural ""
 "Downloading the following {0} plugins has <strong>failed</strong>:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Download af den følgende plugin er <strong>fejlet</strong>:"
+msgstr[1] "Download af de følgende plugins er <strong>fejlet</strong>:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
 msgid "Search:"
-msgstr ""
+msgstr "Søg:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:119
 msgid "Enter a search expression"
-msgstr ""
+msgstr "Angiv et søgeudtryk"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:172
@@ -11605,9 +11634,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:296
 msgid "Download list"
-msgstr ""
+msgstr "Download liste"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:297
 msgid "Download the list of available plugins"
-msgstr ""
+msgstr "Download listen over tilgængelige plugins"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:326
@@ -11623,13 +11652,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:327
 msgid "Update the selected plugins"
-msgstr ""
+msgstr "Opdatér de markerede plugins"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:379
 msgid "Configure sites..."
-msgstr ""
+msgstr "Konfigurér steder..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:380
 msgid "Configure the list of sites where plugins are downloaded from"
-msgstr ""
+msgstr "Konfigurér listen over steder hvorfra plugins bliver downloadet"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
@@ -11725,5 +11754,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:240
 msgid "Attention: Use real keyboard keys only!"
-msgstr ""
+msgstr "Bemærk: Brug kun rigtige tastaturtaster!"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:247
@@ -11774,5 +11803,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
 msgid "Close the preferences dialog and discard preference updates"
-msgstr ""
+msgstr "Luk indstillingsdialogen og kassér opdateringer af indstillinger"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -11823,5 +11852,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:118
 msgid "Download plugins"
-msgstr ""
+msgstr "Download plugins"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:150
@@ -12028,9 +12057,11 @@
 "list of available plugins."
 msgstr ""
+"Klik venligst på <strong>Download liste</strong> for at downloade og vise en "
+"liste over tilgængelige plugins."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:112
 #, java-format
 msgid "{0}: Version {1} (local: {2})"
-msgstr ""
+msgstr "{0}: Version {1} (lokal: {2})"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
@@ -12051,5 +12082,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
 msgid "Invalid API URL"
-msgstr ""
+msgstr "Ugyldig API URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
@@ -12073,5 +12104,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
 msgid "Connection to API failed"
-msgstr ""
+msgstr "Forbindelse til API slået fejl"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
@@ -12190,5 +12221,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
 msgid "Save to preferences"
-msgstr ""
+msgstr "Gem i indstillingsfil"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
@@ -12320,5 +12351,12 @@
 msgstr "Slet markeringen i tag-tabellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -12326,18 +12364,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "Valgfri attributter:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr "lukketvej"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Ukendt type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -12348,16 +12386,16 @@
 msgstr "Kunne ikke læse kilde med fordefinerede tags: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fejl ved fortolkning af {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, 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:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -12366,18 +12404,17 @@
 msgstr[1] "Ret {0} objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "Intet er valgt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "Markering uegnet!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "Anvend fordefinition"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Ret egenskaber"
@@ -12436,11 +12473,9 @@
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
 "capabilities. Got ''{2}''"
 msgstr ""
-"Advarsel: Ulovlig værdi af attribut ''{0}'' af element ''{1}'' i "
-"serverkapabilitet. Fik {2}."
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
@@ -12482,5 +12517,5 @@
 #, java-format
 msgid "Unexpected value for ''{0}'' in changeset query url, got {1}"
-msgstr ""
+msgstr "Uventet værdi af ''{0}'' i rettesætsforespørgsels-URL. Fik {1}."
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:362
@@ -12494,5 +12529,5 @@
 #, java-format
 msgid "Unsupported parameter ''{0}'' in changeset query string"
-msgstr ""
+msgstr "Ikkeunderstøttet parameter ''{0}'' i rettesætsforespørgselsstreng"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
@@ -12518,5 +12553,5 @@
 #, java-format
 msgid "Warning: no preference ''{0}'' found."
-msgstr ""
+msgstr "Advarsel: Ingen indstilling ''{0}'' fundet."
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:109
@@ -12666,6 +12701,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12679,4 +12714,6 @@
 "available"
 msgstr ""
+"Der opstod en fejl under fortolkning af GPX-fil {0}. Kun en del af filen vil "
+"være tilgængelig."
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
@@ -12690,9 +12727,9 @@
 msgstr "Fortolkning af fil \"{0}\" fejlede"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Fejl ved fortolkning: ulovlig datastruktur for gpx-dokument"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12708,23 +12745,28 @@
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
-#, fuzzy
 msgid "Looking for image files"
-msgstr "Søger efter kystlinje..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
 msgid "No image files found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+msgstr "Ingen billedfiler fundet."
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
-msgstr ""
+msgstr "Kunne ikke åbne input-strøm for resurse ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, fuzzy, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+"Advarsel: Kunne af sikkerhedsårsager ikke få adgang til mappen ''{0}''. "
+"Undtagelsen var: {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#, fuzzy, java-format
+#, java-format
 msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
-"Ingen primitiv med ID {0} i det lokale datasæt. Kan ikke udlede "
-"primitivtypen."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308
@@ -12792,5 +12834,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "Koordinater importeret: "
@@ -12862,5 +12904,5 @@
 #, java-format
 msgid "Successfully opened changeset {0}"
-msgstr "Åbnede problemfrit rettesæt {0}"
+msgstr "Åbnede med succes rettesæt {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:345
@@ -12878,5 +12920,5 @@
 #, java-format
 msgid "Updating changeset {0}..."
-msgstr ""
+msgstr "Opdaterer rettesæt {0}..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:387
@@ -12893,9 +12935,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Uploader {0} objekter..."
-msgstr[1] "Uploader {0} objekter..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -13041,4 +13083,6 @@
 "({1},{2}). Skipping."
 msgstr ""
+"Advarsel ikkeunderstøttet startelement ''{0}'' i rettesætsindhold på "
+"position ({1},{2}). Springer over."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:241
@@ -13054,4 +13098,6 @@
 "({1},{2}). Skipping."
 msgstr ""
+"Advarsel ikkeunderstøttet slutelement ''{0}'' i rettesætsindhold på position "
+"({1},{2}). Springer over."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:307
@@ -13441,9 +13487,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159
-#, fuzzy, java-format
+#, java-format
 msgid "({0}/{1}) Uploading {2} object..."
 msgid_plural "({0}/{1}) Uploading {2} objects..."
-msgstr[0] "({0}/{1}) Uploader {2} objekter..."
-msgstr[1] "({0}/{1}) Uploader {2} objekter..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
@@ -13510,5 +13556,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Loading of the plugin \"{0}\" was requested.<br>This plugin is no "
@@ -13516,7 +13562,4 @@
 "disabled.<br>Delete from preferences?</html>"
 msgstr ""
-"<html>Der blev anmodet om indlæsning af udvidelsen {0}.<br>Denne udvidelse "
-"bliver ikke længere udviklet på og vil sandsynligvis medføre fejl.<br>Den "
-"bør slås fra.<br>Slet fra indstillinger?</html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:167
@@ -13532,7 +13575,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:194
-#, fuzzy
 msgid "Click to update the activated plugins"
-msgstr "Klik for at lukke dialogen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
@@ -13545,5 +13587,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -13551,6 +13593,6 @@
 "Plugin {0} requires {1} plugins which were not found. The missing plugins "
 "are:"
-msgstr[0] "Udvidelsen {0} kræves af udvidelsen {1}, men blev ikke fundet."
-msgstr[1] "Udvidelsen {0} kræves af udvidelsen {1}, men blev ikke fundet."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13635,7 +13677,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:625
-#, fuzzy, java-format
+#, java-format
 msgid "Click to delete the plugin ''{0}''"
-msgstr "Slet gammel udvidelse {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
@@ -13671,7 +13713,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#, fuzzy, java-format
+#, java-format
 msgid "Click to disable the plugin ''{0}''"
-msgstr "Klik for at lukke dialogen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:731
@@ -13715,12 +13757,11 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:890
-#, fuzzy
 msgid "Do not check and ask again at startup (remembers choice)"
-msgstr "Vis ikke igen (husker valg)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:69
-#, fuzzy, java-format
+#, java-format
 msgid "The plugin file ''{0}'' does not include a Manifest."
-msgstr "Fil ''{0}'' findes ikke."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:181
@@ -13817,5 +13858,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13823,8 +13863,4 @@
 "file a bug report."
 msgstr ""
-"En uventet handling opstod.\n"
-"\n"
-"Dette er altid en programmeringsfejl. Hvis du bruger seneste\n"
-"udgave af JOSM, kan du hjælpe ved at sende en fejlrapport."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13924,6 +13960,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -14064,6 +14100,6 @@
 "Kan ikke finde nogen oversættelse for sprogvalget {0}. Benytter i stedet {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -14074,5 +14110,5 @@
 "Undtagelsen var: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -14144,38 +14180,32 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
 "geometry from preferences."
 msgstr ""
+
+#: ../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 ""
 "Indstilling med nøgle ''{0}'' giver ikke en heltalsværdi for ''{1}''. Fik "
 "{2}. Kan ikke genskabe vinduesgeometri udfra indstillinger."
 
-#: ../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 ""
-"Indstilling med nøgle ''{0}'' giver ikke en heltalsværdi for ''{1}''. Fik "
-"{2}. Kan ikke genskabe vinduesgeometri udfra indstillinger."
-
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:115
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
 "{2}. Cannot restore window geometry from preferences."
 msgstr ""
-"Indstilling med nøgle ''{0}'' giver ikke en heltalsværdi for ''{1}''. Fik "
-"{2}. Kan ikke genskabe vinduesgeometri udfra indstillinger."
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:122
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Preference with key ''{0}'' does not exist. Cannot restore window geometry "
 "from preferences."
 msgstr ""
-"Indstilling med nøgle ''{0}'' giver ikke en heltalsværdi for ''{1}''. Fik "
-"{2}. Kan ikke genskabe vinduesgeometri udfra indstillinger."
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
@@ -14234,4 +14264,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr "Synlighed"
@@ -14322,5 +14353,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "Adresse-interpolering"
@@ -14913,5 +14944,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr "Sted"
@@ -15071,21 +15102,21 @@
 "Fjern området fra relationen før du opdeler det."
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr "TangoGPS Filer (*.log)"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr "Formatfejl: "
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr "TCX Filer (*.tcx)"
@@ -15117,9 +15148,9 @@
 msgstr "Opret kopi af vej"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -15134,13 +15165,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr "Importér rute fra GPX-lag"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr "Slet eksisterende rute"
@@ -15149,6 +15180,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr "Intet GPX-datalag blev fundet"
@@ -15374,17 +15405,17 @@
 msgstr "Hent billedsæt som et nyt lag."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr "Retningsindex '{0}' blev ikke fundet"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr "Startstedet var ikke indenfor afgrænsningsfeltet"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:105
 msgid "Looking for shoreline..."
 msgstr "Søger efter kystlinje..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -15428,42 +15459,41 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr "Lakewalker spor"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr "Der er opstået en ukendt fejl"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "øst"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "nordøst"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "nord"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "nordvest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "vest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "sydvest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "syd"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "sydøst"
@@ -15519,6 +15549,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -15527,74 +15557,74 @@
 msgstr "vand"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "kystlinje"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "land"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Maximum number of segments per way"
 msgstr "Maksimalt antal segmenter pr. vej"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
 msgid "Maximum number of nodes in initial trace"
 msgstr "Maks antal punkter i foreløbig sporing"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../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:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Opløsning af Landsat-tern (pixels pr. grad)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Størrelse af Landsat-tern (pixels)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
 msgid "Shift all traces to east (degrees)"
 msgstr "Forskyd alle spor mod øst (grader)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
 msgid "Shift all traces to north (degrees)"
 msgstr "Forskyd alle spor mod nord (grader)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
+#: ../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:59
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
 msgid "Tag ways as"
 msgstr "Tag veje som"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr "WMS-lag"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../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:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:68
 msgid "Source text"
 msgstr "Kilde tekst"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Maksimalt antal segmenter tillladt for hver genereret vej. Standard er 250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -15602,5 +15632,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -15610,5 +15640,5 @@
 "være i området 0-255. Standard er 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -15616,58 +15646,58 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr "Opløsning af Landsat-tern, målt i pixels pr. grad. Standard er 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Størrelse af et Landsat-tern, målt i pixels. Standard er 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../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:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr "Marker veje som vand, kystlinje, land eller intet. Default er vand."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "Maks størrelse af hver mellemlager-mappe i bytes. Standard er 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "En udvidelse at optegne vandflader på Landsat billeder med."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:50
 msgid "Downloading image tile..."
 msgstr "Downloader billedtern..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr "Kunne ikke få billede"
@@ -15691,5 +15721,5 @@
 msgstr "Forbindelse fejlede"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr "intet navn"
@@ -15720,5 +15750,5 @@
 msgstr "Kurs"
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr "LiveGPS-lag"
@@ -15792,5 +15822,5 @@
 msgstr "Vinkel mellem to valgte punkter"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr ""
@@ -16057,4 +16087,76 @@
 msgid "Firefox executable"
 msgstr "Firefox-programfil"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#, fuzzy
+msgid "Read error!"
+msgstr "Vandreservoir"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Indtast koordinater for det nye punkt"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Behold backup-filer"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Fejl"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "Billedfilen kunne ikke slettes"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Kunne ikke omdøbe filen \"{0}\""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Behold backup-filer"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "Behold backup-filer"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Overskriv"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+#, fuzzy
+msgid "Could not delete temporary file!"
+msgstr "Kunne ikke importere filer."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
@@ -16330,6 +16432,6 @@
 msgstr "Gem optagede data til fil hvert minut."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -16455,72 +16557,131 @@
 "først."
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+#, fuzzy
+msgid "Terrace a house"
+msgstr "Finmask bygning til rækkehuse"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+#, fuzzy
+msgid "Interpolation"
+msgstr "Adresse-interpolering"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr "Segmenter"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Veje"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Højeste nummer"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Laveste nummer"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+#, fuzzy
+msgid "Lowest housenumber of the terraced house"
+msgstr "Laveste husnummer kan ikke være højere end højeste husnummer"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Opret en ny relation"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Opret kopi af vej"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Vejnavn"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr "Lige/ulige"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr "Laveste nummer"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr "Højeste nummer"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr "Segmenter"
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr "Laveste husnummer kan ikke være højere end højeste husnummer"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr "Husnummer stemmer ikke med ulige/lige indstilling"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr "Segmenter skal være ét nummer større"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr "{0} skal være større end 0"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr "{0} er ikke et nummer"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr "Vend et rækkehus om"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr "Reverserer rækkehusnumre"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr "Vend et rækkehus om"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:83
+#, fuzzy
+msgid "Cannot reverse!"
+msgstr "ikke tilgængelig"
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:125
 msgid "Reverse Terrace"
 msgstr "Vend rækkehus om"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr "Finmask bygning til rækkehuse"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr "Opretter individuelle bygninger fra en aflang bygning"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr "Markér en enkelt, lukket vej med mindst 4 punkter"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr "Rækkehus"
@@ -16757,5 +16918,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr "Dublet-punkter"
@@ -16767,5 +16928,5 @@
 "sted."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16777,9 +16938,9 @@
 "bruger dem.<br>Ønsker du virkelig at slette?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr "Bekræftelse"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr ""
@@ -16816,5 +16977,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -16970,7 +17131,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr "Ugyldig kombination af tag/værdi"
@@ -16978,81 +17139,81 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr "Farvelægger problem"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Nøgle \"{0}\" er ugyldig"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr "Tags med tomme værdier"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr "Ulovlig egenskabsnøgle"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr "Ulovligt blanktegn i egenskabsnøgle"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr "Egenskabsværdi begynder eller slutter med blanktegn"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr "Egenskabsværdi indeholder HTML-kodet tegn"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Nøglen \"{0}\" er ikke fordefineret"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr "Fordefinitionerne indeholder ikke egenskabs-nøglen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Værdien \"{0}\" for nøglen \"{1}\" er ikke fordefineret"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr "Fordefinitionerne indeholder ikke egenskabs-værdi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr "FIXMEs"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr "Tjek egenskabsnøgler"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 "Kontrollér at egenskabsnøglerne er gyldige ved at tjekke med en ordliste."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr "Brug kompleks egenskabs-tjekker."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr "TagChecker-kilde"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -17062,87 +17223,87 @@
 "speller) kilder (URL eller filnavn) eller tagtjekkerdatafiler."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr "Tilføj en ny kilde til listen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr "Ret den valgte kilde."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "Slet den valgte kilde fra listen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "Datakilder"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr "Tjek egenskabsværdier."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 "Godkend at egenskabs-værdier er gyldige tjeks i forhold til fordefinitioner."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr "Tjek for FIXMEs"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Søger efter punkter eller veje med FIXME i enhver egenskavsværdi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr "Brug standard-datafil."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr "Brug standard-datafilen (anbefales)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr "Brug standardfil for ignorerede tags."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr "Brug standardfilen for ignorerede tags (anbefalet)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr "Brug stavekontrollens standardfil."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Brug stavekontrollens standardfil (anbefales)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr "Ret egenskaber"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr "Kunne ikke finde element-typen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr "Kunne ikke finde advarsels-niveau"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Ugyldigt udtryk ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -17603,5 +17764,5 @@
 msgstr "WMS-lag ({0}) downloader i zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -17616,13 +17777,17 @@
 "hente WMS-tern alligevel?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr "Ja hent billeder"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr "Ugyldig URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+msgid "Download visible tiles"
+msgstr "Download synlige tern"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -17631,50 +17796,46 @@
 "opløsningen."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
-msgid "Download visible tiles"
-msgstr "Download synlige tern"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "Skift opløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr "Genhent fejlagtige tern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr "Alpha-kanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "Gem WMS-lag til fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr "Gem WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "Indlæs WMS-lag fra fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr "Indlæs WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, 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:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr "Fil format fejl"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "Fejl ved indlæsning af fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr "Sæt WMS-bogmærke"
@@ -17952,6 +18113,13 @@
 "Starter Firefox for at vise den nu synlige skærm som et pænt SVG-billede."
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17962,15 +18130,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr "Tillad andre applikationer at sende kommandoer til JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17981,10 +18149,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr "Tilføjer ruteplan-egenskaber"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17995,15 +18163,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Tillad tilføjelse af markører/punkter på de nuværende gps-positioner."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Stiller en dialog til redigering af tags i tabelform til rådighed"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -18016,10 +18184,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr "Laver rækkehuse ud af en enkelt blok."
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -18030,5 +18198,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -18039,10 +18207,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Nem download langs et langt sæt af indbyrdes forbundne veje"
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -18149,6 +18317,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -18156,6 +18333,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "Reference"
@@ -18172,5 +18350,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Baner"
@@ -18192,10 +18370,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Maks. hastighed (km/t)"
@@ -18239,14 +18417,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "Ensrettet"
@@ -18289,13 +18467,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -18333,13 +18511,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -18374,13 +18552,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "Indhak"
@@ -18415,13 +18593,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "Vold"
@@ -18553,4 +18731,13 @@
 msgid "Edit Unclassified Road"
 msgstr "Ret uklassificeret vej"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr ""
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -18568,15 +18755,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr "Bredde (meter)"
@@ -18588,5 +18775,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Beboelse"
@@ -18595,5 +18782,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "Ret en beboelsesgade"
@@ -18611,16 +18798,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Overflade"
@@ -18642,166 +18832,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr "brolagt"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr "ikke brolagt"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr "asfalt"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr "beton"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr "metal"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "træ"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr "fliser"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr "brosten"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "grus"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr "småsten"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr "kompakteret"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr "Græs_belægning"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "græs"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "sand"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr "jord"
@@ -18809,5 +19006,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr "Legegade"
@@ -18816,5 +19013,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr "Ret legegade"
@@ -18822,5 +19019,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "Gågade"
@@ -18829,5 +19026,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "Ret gågade"
@@ -18835,5 +19032,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr "Service"
@@ -18842,5 +19039,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr "Ret servicevej"
@@ -18850,18 +19047,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr "gyde"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr "Vej mellem parkeringsbåse"
@@ -18869,5 +19066,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr "Vej mellem parkeringsbåse"
@@ -18877,5 +19074,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr "Ret vej mellem parkeringsbåse"
@@ -18883,5 +19080,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "Vej (ukendt type)"
@@ -18890,5 +19087,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "Ret vej af ukendt type"
@@ -18897,20 +19094,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "Adgangsbegrænsninger"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "Ret adgangsbegrænsninger"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "Betalingsanlæg"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "Blind vej"
@@ -18918,9 +19115,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 msgid "Access"
 msgstr "Adgang"
 
 #. 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"
@@ -18931,6 +19129,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18942,4 +19138,5 @@
 #. 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"
@@ -18958,141 +19155,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+msgid "yes"
+msgstr "ja"
+
+#. 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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "privat"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+msgstr "designeret"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:219
+msgid "destination"
+msgstr "destination"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr "tilladt"
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr "landbrug"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-msgid "yes"
-msgstr "ja"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "privat"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-msgstr "designeret"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "destination"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr "tilladt"
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr "landbrug"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "nej"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr "Varer"
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Lastbil"
@@ -19107,10 +19312,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr "Hest"
@@ -19126,10 +19331,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "Motorcykel"
@@ -19144,27 +19349,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr "Motorkøretøj"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr "Offentlig transport"
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr "Motorbåd"
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "Båd"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Min. hastighed (km/t)"
@@ -19172,25 +19369,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "Maks. vægt (ton)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr "Maks. højde (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr "Maks. bredde (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr "Maks. længde (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "Rundkørsel"
@@ -19201,5 +19398,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "Ret trafikknudepunkt"
@@ -19219,10 +19416,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "motorvej"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr "motorvejsforbindelse"
@@ -19244,10 +19441,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "motortrafikvej"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr "motortrafikvejsforbindelse"
@@ -19269,10 +19466,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "primær"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr "primær-(til/fra)-kørsel"
@@ -19294,5 +19491,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -19307,9 +19504,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "tertiær"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr "uklassificeret"
@@ -19323,9 +19520,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "beboelse"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr "legegade"
@@ -19355,10 +19552,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "service"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr "bus-ledevej"
@@ -19388,5 +19585,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -19398,10 +19595,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Ret bro"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr "Ret en tunnel"
@@ -19409,19 +19606,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Stier"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "Under udførelse"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "Ret vej under udførelse"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "Kryds"
@@ -19437,5 +19634,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "rundkørsel"
@@ -19443,5 +19640,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr "Spor"
@@ -19450,40 +19647,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr "Ret spor"
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "Spor"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "grus"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "grus"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "grus"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "grus"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "grus"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr ""
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -19491,5 +19682,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -19497,37 +19688,32 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr "vandring"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "Mountainbiking"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
-msgstr "Krævende bjergvandring"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
-msgstr "Alpevandring"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
-msgstr "Krævende alpevandring"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
-msgstr "Hård alpevandring"
+msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "Sti"
@@ -19536,12 +19722,32 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "Ret sti"
 
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
+
 #: build/trans_presets.java:489
-#, fuzzy
 msgid "Wheelchairs"
-msgstr "kørestol"
+msgstr ""
 
 #: build/trans_presets.java:490
@@ -19557,7 +19763,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "Ret ridesti"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -19570,7 +19775,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "Ret cykelsti"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -19605,24 +19809,21 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "Sammensæt alligevel"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "Ret gangsti"
+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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Ret gangsti"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr "Cykler"
@@ -19630,5 +19831,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "Trin"
@@ -19638,5 +19839,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Ret trappetrin"
@@ -19644,10 +19845,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr "Vejpunkter"
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "Motorvejskryds"
@@ -19655,15 +19856,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "Ret motorvejskryds"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "Motorvejsrasteplads"
@@ -19671,5 +19872,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr "Ret tankstation"
@@ -19677,5 +19878,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -19708,17 +19910,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "Selskab"
@@ -19727,5 +19929,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "Færdselssignal"
@@ -19735,5 +19937,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr "Type af fodgængerfelt"
@@ -19742,27 +19944,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr "ukontrolleret"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr "trafik_lys"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "helleanlæg"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr "uden markering"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr "Overgangssted for ridende"
@@ -19770,6 +19972,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr "Overkørsel for cykler"
@@ -19778,11 +19980,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -19790,30 +19992,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr "fodgængerfelt"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr "fodgængerfelt med trafikstyring"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "Stop"
@@ -19821,5 +20023,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr "Fodgængerfelt"
@@ -19828,14 +20030,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr "Ret overkørsel"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr "Mini-rundkørsel"
@@ -19846,14 +20094,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr "Retning"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr "med uret"
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr "Vendeplads"
@@ -19863,26 +20111,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "Bygrænse"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "Ret et bygrænse-skilt"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr "Andet navn"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 msgid "Speed Camera"
 msgstr "Fartkamera"
 
 #. 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "Nødtelefon"
@@ -19890,5 +20140,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr "Stigning"
@@ -19896,5 +20146,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr "Stejl stigning"
@@ -19902,11 +20152,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr "Vadested"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr "Ret vadested"
@@ -19914,5 +20171,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr "Bjergpas"
@@ -19920,5 +20177,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr "Ret bjergpas"
@@ -19930,7 +20187,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "Højde"
@@ -19938,5 +20195,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Barrierer"
@@ -19944,5 +20201,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr "Pæl"
@@ -19950,5 +20207,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr "Ret en pæl"
@@ -19993,16 +20250,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "Tilladt trafik:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr "Cykelhindring"
@@ -20011,5 +20268,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr ""
@@ -20017,5 +20274,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr "Kreaturrist"
@@ -20023,10 +20280,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr "Ret en kreaturrist"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr "Bussluse"
@@ -20034,15 +20291,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr "Pigge"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "Betalingsanlæg"
@@ -20050,5 +20307,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "Ret betalingsanlæg"
@@ -20056,10 +20313,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr "Grænsekontrol"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr "Ret grænsekontrol"
@@ -20069,5 +20326,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr "Hæk"
@@ -20076,12 +20333,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:817 build/trans_presets.java:819
 msgid "Fence"
 msgstr "Hegn"
 
-#. item "Barriers/Fence"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "Mur"
@@ -20089,5 +20358,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "Bymur"
@@ -20096,5 +20365,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr "Støttemur"
@@ -20106,15 +20375,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr "Indgang"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr "Ret indgang"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "Port"
@@ -20122,50 +20392,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr "Ret port"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr "Bom"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr "Ret bom"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr "Trådled"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr "Ret trådled"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr "Skubbeport"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr "Ret skubbeport"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr "Stente"
@@ -20173,25 +20443,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr "Ret en stente"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr "Udfaldsport"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr "Ret en udfaldsport"
@@ -20202,11 +20472,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "Vand"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "Udspring"
@@ -20214,5 +20484,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "Ret udspring"
@@ -20220,5 +20490,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr "Dræn"
@@ -20226,10 +20496,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr "Ret dræn"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "Bæk"
@@ -20237,10 +20518,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "Ret bæk"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "Kanal"
@@ -20248,10 +20529,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "Ret kanal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "Flod"
@@ -20261,5 +20542,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "Ret flod"
@@ -20267,15 +20548,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Ret vand"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "Ret land"
@@ -20283,15 +20564,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr "Bassin"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr "Vandreservoir"
@@ -20299,15 +20580,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr "Ret område for vandreservoir"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr "Overdækket reservoir"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr "Ret overdækket reservoir"
@@ -20315,5 +20596,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "Flodbred"
@@ -20322,10 +20603,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "Ret flodbred"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr "Vådområde"
@@ -20336,14 +20617,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr "Ret vådområde"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "Sump"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr "mose"
@@ -20357,35 +20638,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr "marsk"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr "marskland"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr "saltmarsk"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr "vadehavsområde"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "Mudder"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr "Ret mudder"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "Strand"
@@ -20393,20 +20674,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "Ret strand"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "Bugt"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "Ret bugt"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "Klippe"
@@ -20414,10 +20695,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "Ret klippe"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "Kystlinje"
@@ -20425,5 +20706,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "Ret kystlinje"
@@ -20431,5 +20712,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "Færgerute"
@@ -20437,5 +20718,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr "Ret færge"
@@ -20444,5 +20725,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr "Værft"
@@ -20450,10 +20731,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr "Ret værft"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "Dok"
@@ -20461,5 +20742,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr "Ret dok"
@@ -20467,5 +20748,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "Dæmning"
@@ -20473,15 +20754,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "Ret dæmning"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr "Vandvejs-punkt"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr "Sluseport"
@@ -20490,5 +20771,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr "Damlukke"
@@ -20496,20 +20777,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr "Ret stemmeværk"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "Vandfald"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "Ret vandfald"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr ""
@@ -20518,15 +20799,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr "Lystbådehavn"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr "Ret lystbådehavn"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "Mole"
@@ -20534,10 +20815,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "Ret mole"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr "Færgehavn"
@@ -20545,10 +20826,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr "Ret færgehavn"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr "Slæbested"
@@ -20558,20 +20839,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr "Ret slæbested"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr "Transport"
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "Jernbane"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "Spor"
@@ -20579,5 +20860,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr "Ret spor"
@@ -20586,139 +20867,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr "standard"
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr "Banegård"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr "sidespor"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr "sidespor"
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr "bane"
+
+#. 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:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+msgid "Voltage"
+msgstr "Spænding"
+
+#. 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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr "Smalsporet bane"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr "Ret smalsporet jernbane"
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr "Monorail"
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr "Ret monorail"
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr "Bevaret"
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr "Ret bevaret jernbane"
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr "Letbane"
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr "Ret letbane"
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "Metro"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "Ret metro"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "Sporvogn"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr "Ret sporvogn"
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr "Styreskinne til bus"
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr "Ret styreskinne til bus"
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "Ubrugt jernbanespor"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "Ret ubrugt jernbanespor"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr "Valgfri typer"
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr "Banegård"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr "sidespor"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr "sidespor"
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr "Smalsporet bane"
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr "Ret smalsporet jernbane"
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr "Monorail"
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr "Ret monorail"
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr "Bevaret"
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr "Ret bevaret jernbane"
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr "Letbane"
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr "Ret letbane"
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "Metro"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "Ret metro"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "Sporvogn"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr "Ret sporvogn"
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr "Styreskinne til bus"
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr "Ret styreskinne til bus"
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "Ubrugt jernbanespor"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "Ret ubrugt jernbanespor"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "Fjernet jernbane"
@@ -20727,5 +21247,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr "Jernbaneoverskæring"
@@ -20734,5 +21254,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr "Fodgængerovergang (over jernbane)"
@@ -20742,5 +21262,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr "Overgangstype"
@@ -20748,5 +21268,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "Drejeskive"
@@ -20755,10 +21275,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr "Luftvej"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "Skilift"
@@ -20766,10 +21293,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr "Ret skilift"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr "Træklift"
@@ -20777,10 +21304,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr "Ret træklift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "Tovbane"
@@ -20788,10 +21315,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "Ret tovbane"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr "Gondol"
@@ -20799,10 +21326,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr "Ret Gondol"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20810,12 +21337,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr "Ret station"
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "Brændstof"
@@ -20825,9 +21365,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Ret brændstof"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20881,32 +21478,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "Åbningstider"
@@ -20965,94 +21562,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mandag-Fredag 08:30-20:00"
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -21064,5 +21737,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -21072,5 +21745,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Ret parkering"
@@ -21081,25 +21754,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr "Referensenummer"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "fleretages"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "overflade"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr "underjordisk"
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr "Parkér og kør"
@@ -21108,48 +21781,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "Gebyr"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr "Handicapplads"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr "Område for kvinder"
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr "Område for forældre"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "Vask"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "Ret bilvask"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "Bilmekaniker"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "Ret bilmekaniker"
@@ -21157,5 +21830,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "Udlejning"
@@ -21164,10 +21837,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "Ret biludlejning"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr "Deling"
@@ -21175,5 +21848,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr "Ret bildeling"
@@ -21181,10 +21854,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "Ret cykelparkering"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr "Kapacitet"
@@ -21193,15 +21866,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "Ret cykeludlejning"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Offentlig transport"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -21211,5 +21884,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -21217,5 +21890,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr "UIC-reference"
@@ -21223,5 +21896,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr "Jernbane-stop"
@@ -21229,5 +21902,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr "Ret stop"
@@ -21235,5 +21908,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "Sporvogns-stop"
@@ -21242,5 +21915,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "Ret sporvogns-stop"
@@ -21248,5 +21921,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "Jernbaneplatform"
@@ -21255,5 +21928,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "Ret jernbaneplatform"
@@ -21265,5 +21938,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr "Spornummer"
@@ -21271,10 +21944,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr "Område"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "Indgang til undergrundsbane"
@@ -21283,10 +21956,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "Ret indgang til undergrundsbane"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr "kørestol"
@@ -21295,5 +21968,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "Rutebilstation"
@@ -21302,5 +21975,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "Ret rutebilstation"
@@ -21308,5 +21981,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "Busstop"
@@ -21316,5 +21989,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "Ret busstop"
@@ -21323,25 +21996,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr "Læskur"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "Bænk"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr "Rutebil-platform"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr "Ret rutebil-platform"
@@ -21349,5 +22023,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "Taxi"
@@ -21355,5 +22029,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "Ret taxiholdeplads"
@@ -21361,32 +22035,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "Lufthavn"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr "Ret lufthavn"
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr "IATA"
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr "ICAO"
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+msgid "Beacon"
+msgstr "Pejlemærke"
+
+#. 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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr "Rejse"
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Overnatning"
@@ -21398,5 +22167,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -21405,15 +22174,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "Ret hotel"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "Stjerner"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr "Motel"
@@ -21421,20 +22190,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr "Ret motel"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr "Gæstehus"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr "Ret gæstehus"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "Feriehytte"
@@ -21442,10 +22211,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr "Ret feriehytte"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr "Vandrerhjem"
@@ -21453,30 +22222,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr "Ret vandrerhjem"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr "Alpin hytte"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr "Ret alpin hytte"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr "Campingplads"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr "Ret campingplads"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "Camping plads"
@@ -21484,10 +22253,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr "Ret campingplads"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Mad+drikke"
@@ -21498,5 +22267,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -21504,5 +22273,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "Ret restaurant"
@@ -21510,5 +22279,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr "Køkken"
@@ -21516,61 +22285,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "italiensk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "kinesisk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "græsk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "tysk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "indisk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "tyrkisk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "asiatisk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "mexicansk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "japansk"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "Fastfood"
@@ -21578,9 +22359,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "Ret fastfood-restaurant"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "Café"
@@ -21588,9 +22377,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "Ret café"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "Pub"
@@ -21598,18 +22387,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "Ret pub"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr "Ret biergarten"
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr "Bar"
@@ -21617,9 +22406,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr "Ret bar"
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "Natklub"
@@ -21627,24 +22416,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "Ret natklub"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Turisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr "Forlystelse"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr "Ret forlystelse"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Museum"
@@ -21652,9 +22441,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Ret museum"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Zoo"
@@ -21663,9 +22452,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Ret zoo"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "Udsigtspunkt"
@@ -21673,24 +22462,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "Ret udsigtspunkt"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr "Udkigstårn"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "Forlystelsespark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr "Ret forlystelsespark"
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "Kunstværk"
@@ -21698,5 +22487,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "Ret kunstværk"
@@ -21704,19 +22493,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr "Informationskontor"
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Kort"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr ""
@@ -21754,5 +22543,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -21760,28 +22549,28 @@
 msgstr "gade"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr "Vist område"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr "sted"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr "by"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr "Nærmere beskrivelse"
@@ -21791,5 +22580,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr "Ruter vist for:"
@@ -21797,5 +22586,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr "Vandring"
@@ -21803,6 +22592,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "Cykling"
@@ -21810,5 +22599,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr "Mountainbiking"
@@ -21816,6 +22605,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "Skisport"
@@ -21823,5 +22612,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr "Ridning"
@@ -21829,46 +22618,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "historie"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr "natur"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr "dyreliv"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr "planter"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr "Guide post"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr "Informations terminal"
@@ -21876,29 +22665,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr "Nærmere beskrivelse"
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr "Audio guide"
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr "Audio guide via mobiletelefon?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr "Telefonnummer"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr "Andre informations punkter"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr "Ret shelter"
@@ -21906,25 +22695,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr "Bålplads"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "Picnic sted"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "Ret picnic sted"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Historiske steder"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Borg"
@@ -21933,19 +22722,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Ret borg"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Ret ruiner"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Arkæologisk sted"
@@ -21954,9 +22743,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "Ret arkæologisk sted"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "Slagmark"
@@ -21964,10 +22753,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "Ret slagmark"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr "Palæontologisk sted"
@@ -21975,5 +22764,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr "Ret palæontologisk sted"
@@ -21981,15 +22770,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "Ret monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "Mindesmærke"
@@ -21997,55 +22786,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "Ret mindesmærke"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr "Vejkantskors"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr "Ret vejkantskors"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr "Ret vejkantstempel"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr "Ret vejkantstempel"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr "Grænsesten"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr "Ret grænsesten"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Rekreation"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "Badeland"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "Ret badeland"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Legeplads"
@@ -22053,35 +22842,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Ret legeplads"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Fiskeri"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "Ret fiskeri"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr "Sportsfaciliteter"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Ret stadion"
@@ -22095,6 +22884,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "vælg sportsgren:"
@@ -22486,6 +23275,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -22519,225 +23308,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "bueskydning"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr "atletik"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "australsk fodbold"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr "petanque"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "klatring"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr "kroket"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "cykling"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr "hundeløb"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr "ridning"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "amerikansk fodbold"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "gymnastik"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr "travbane"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "skydebane"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr "skating"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "skisport"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "fodbold"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "svømning"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "Idrætscenter"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "Ret idrætscenter"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr "Væddeløbsbane"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr "Ret væddeløbsbane"
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "Golfbane"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "Ret golfbane"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "Ret minigolf"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr "Ret multi"
@@ -22776,21 +23565,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "type"
@@ -22829,203 +23618,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr "bane"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "sportshal"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr "spor"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr "Ret bowling"
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr "Atletik"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr "Ret atletik"
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "Bueskydning"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "Ret bueskydning"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "Klatring"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "Ret klatring"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr "kano"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr "Ret kanosport"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr "Ret cykling"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "Hundeløb"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr "Ret hundeløb"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr "Ridning"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr "Ret ridning"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr "Galopbane"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr "Ret galopbane"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr "Ret gymnastik"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr "Ret motorsport"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr "Skating"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr "Ret skating"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr "Ret Skateboard"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "Svømning"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "Ret svømning"
@@ -23033,56 +23822,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr "Ret skisport"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr "Piste type"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr "styrtløb"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr "skiløb"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr "Sværhedsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr "nybegynder"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr "let"
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr ""
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr "avanceret"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "Skydning"
@@ -23090,182 +23875,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "Ret skydning"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "Sport (bold)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "Fodbold"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr "Ret fodbold"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "Amerikansk fodbold"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr "Ret amerikansk fodbold"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr "Australsk fodbold"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr "Ret australsk fodbold"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr "Ret Baseball"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "Ret Basketball"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr "Ret Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "Golfbane"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr "Petanque"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr "Ret petanque"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr "Ret cricket"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr "Cricketnet"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr "Ret cricketnet"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr "Kroket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr "Ret kroket"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "Ret hockey"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr "Ret pelota"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr "Ret rugby"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "Ret bordtennis"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "Ret tennis"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr "Menneskeskabt"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Bygninger"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "Bygning"
@@ -23273,5 +24058,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Offentlig bygning"
@@ -23279,10 +24064,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Ret offentlig bygning"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "Rådhus"
@@ -23290,10 +24075,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Ret rådhus"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Ambassade"
@@ -23301,10 +24086,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Ret ambassade"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "Domhus"
@@ -23313,10 +24098,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Ret domhus"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Fængsel"
@@ -23325,10 +24110,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Ret fængsel"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Politi"
@@ -23338,10 +24123,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Ret politi"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "Brandstation"
@@ -23350,10 +24135,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Ret brandstation"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Posthus"
@@ -23361,5 +24146,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Ret posthus"
@@ -23367,15 +24152,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "Børnehave"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "Ret børnehave"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "Skole"
@@ -23383,10 +24168,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "Ret skole"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "Universitet"
@@ -23394,10 +24179,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "Ret universitet"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "Videregående udd."
@@ -23405,5 +24190,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "Ret videregående udd."
@@ -23411,5 +24196,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Biograf"
@@ -23418,10 +24203,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Ret biograf"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "Bibliotek"
@@ -23430,9 +24215,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Ret bibliotek"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "Kunstcenter"
@@ -23440,10 +24225,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "Ret kunstcenter"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Teater"
@@ -23452,10 +24237,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Ret teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "Sted for tilbedelse"
@@ -23465,5 +24250,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "Ret sted for tilbedelse"
@@ -23472,6 +24257,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "Religion"
@@ -23480,66 +24265,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "buddhistisk"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "kristen"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "hinduistisk"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr "jainistisk"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "jødisk"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "muslimsk"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr "spiritistisk"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr "taoistisk"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr "unitar"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr "zoroastristisk"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr "Trosretning"
@@ -23548,81 +24333,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr "anglikansk"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "baptistisk"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "katolsk"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr "evangelisk"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr "Jehovas Vidner"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "luthersk"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr "metodistisk"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr "mormonsk"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "ortodoks"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr "pinsebevægelsen"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr "prebyteriansk"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "protestantisk"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr "kvæker"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr "shiitisk"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr "sunnitisk"
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Adresser"
@@ -23631,5 +24416,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Ret adresseinformation"
@@ -23637,5 +24422,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "Husnummer"
@@ -23643,25 +24428,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "Husnavn"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Vejnavn"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "Bynavn"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "Landekode"
@@ -23670,5 +24455,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "Ret adresse-interpolering"
@@ -23676,61 +24461,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr "Nummereringssystem"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "ulige"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "lige"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr "alfabetisk"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr "Menneskeskabt"
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "Fabrik"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "Ret fabrik"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Tårn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Ret tårn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr "Type af tårn"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr "kommunikation"
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr "observation"
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr "Højde (meter)"
@@ -23738,25 +24523,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Vandtårn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Ret vandtårn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "Gasbeholder"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "Ret gasbeholder"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "Fyrtårn"
@@ -23764,10 +24549,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Ret fyrtårn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Vejrmølle"
@@ -23775,10 +24560,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Ret vejrmølle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Rørledning"
@@ -23787,37 +24572,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Ret rørledning"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
+msgid "gas"
+msgstr "gas"
+
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr "varme"
+
+#: build/trans_presets.java:2353
 msgid "oil"
 msgstr "olie"
 
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-msgid "gas"
-msgstr "gas"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr "Spildevand"
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr "varme"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr "undervands"
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr "på land"
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "Rensningsanlæg"
@@ -23827,10 +24612,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "Ret rensningsanlæg"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Kran"
@@ -23838,21 +24623,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Ret kran"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr "Pejlemærke"
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr "Ret Pejlemærke"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "Målepunkt"
@@ -23860,10 +24640,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "Ret målepunkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "Overvågning"
@@ -23871,11 +24651,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Ret overvågningskamera"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "Generator"
@@ -23885,35 +24677,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "Ret generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "vind"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "vand"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "arom"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "kul"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr "sol"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "Kraftværk"
@@ -23922,10 +24714,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "Ret kraftværk"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -23934,5 +24726,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "Ret transformatorstation"
@@ -23940,10 +24732,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr "Linie reference"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "Elmast"
@@ -23954,23 +24746,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "Ret elmast"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr "tårn"
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr "stang"
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr "Tårn reference"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "Strømkabel"
@@ -23979,79 +24771,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "Ret strømkabel"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr "Linie type"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr "linie"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr ""
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "Spænding"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr "Antal kabler"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr "enkelt"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr "dobbelt"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr "tredobbelt"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr "firdobbelt"
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr "Faciliteter"
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Toiletter"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "Postkasse"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Telefon"
@@ -24060,5 +24847,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Ret telefon"
@@ -24066,5 +24853,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Mønter"
@@ -24072,5 +24859,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "Sedler"
@@ -24078,5 +24865,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr "Elektroniske punge og betalingskort"
@@ -24084,5 +24871,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr "Kreditkort"
@@ -24090,15 +24877,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Genbrug"
@@ -24107,5 +24894,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Ret genbrugsplads"
@@ -24113,63 +24900,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "Dåser"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "Tøj"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "Papir"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "Skrotjern"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+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:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr "Materiale"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr "sten"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr "plastik"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr "Farve"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr "sort"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr "brun"
@@ -24248,5 +25046,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -24256,31 +25054,31 @@
 msgstr "grøn"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr "rød"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr "blå"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr "grå"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr "hvid"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr "Antal sæder"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr "Skydetelt"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr "Ret skydetelt"
@@ -24289,30 +25087,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "Højde"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr "lav"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr "fuld"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr "Skjul"
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr "Lås"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "Springvand"
@@ -24321,10 +25119,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "Ret springvand"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "Vandpost"
@@ -24333,10 +25131,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Ret vandpost"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr "Babyluge"
@@ -24344,15 +25155,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr "Ret babyluge"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Butikker"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr "Bilforhandler"
@@ -24360,10 +25171,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "Ret bilforhandler"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr "Cykelhandler"
@@ -24372,28 +25183,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "Ret cykelhandler"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "Supermarked"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "Ret supermarked"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr "Købmand"
@@ -24401,9 +25212,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr "Ret købmand"
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -24411,27 +25222,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "Ret kiosk"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr "Boghandler"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr "Ret boghandler"
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr "Rejsebureau"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr "Ret rejsebureau"
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "Automat"
@@ -24439,5 +25250,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "Ret automat"
@@ -24445,88 +25256,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "Varer i automat"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr "P-automat"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "mad"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "drikke"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "slik"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "cigaretter"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "billeder"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "dyremad"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "aviser"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "legetøj"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "frimærker"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr "tamponer"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr "høm-høm-pose"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "Slagter"
@@ -24534,9 +25345,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Ret slagter"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "Bager"
@@ -24544,9 +25355,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Ret bager"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "Blomsterhandler"
@@ -24554,18 +25365,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "Ret blomsterhandler"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr "Økologisk"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr "Ret økologisk forretning"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr "Sprit"
@@ -24573,54 +25384,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr "Ret spritbutik"
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr "Drikkevarer"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr "Ret drikkevarebutik"
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "Ret computerforretning"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr "Elektronik"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "Ret elektronikforretning"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr "Hi-fi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr "Ret hi-fi-forhandler"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr "Møbelforretning"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "Ret møbelforretning"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr "Havecenter"
@@ -24628,9 +25439,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr "Ret havecenter"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr "Isenkræmmer"
@@ -24638,9 +25449,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr "Ret isenkræmmer"
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "Gør-det-selv-butik"
@@ -24648,54 +25459,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "Ret gør-det-selv-butik"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "Frisør"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "Ret frisør"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr "Sko"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "Ret skobutik"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr "Legetøjsbutik"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "Ret legetøjsbutik"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr "Ret videobutik"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Kemisk renseri"
@@ -24703,9 +25514,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Ret kemisk renseri"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Vaskeri"
@@ -24713,9 +25524,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Ret vaskeri"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr ""
@@ -24723,28 +25534,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr "Ret sportsbutik"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr "Optiker"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "Ret optiker"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Penge"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Bank"
@@ -24752,14 +25563,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Ret bank"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "Pengeautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Vekselkontor"
@@ -24767,5 +25578,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Ret vekselkontor"
@@ -24773,15 +25584,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Ret pengeautomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Sundhed"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "Lægehus"
@@ -24789,18 +25600,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "Ret lægehus"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "Tandlæge"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "Ret tandlæge"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -24808,5 +25619,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Ret apotek"
@@ -24814,9 +25625,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr "Håndkøb"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Hospital"
@@ -24824,10 +25635,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Ret Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr ""
@@ -24836,5 +25647,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -24843,20 +25654,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(brug forvalgskode, fx +12-345-67890)"
@@ -24864,5 +25675,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "Dyrlæge"
@@ -24871,64 +25682,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "Ret dyrlæge"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr "Geografi"
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Steder"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Ret et kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Ret land"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "Stat"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "Ret stat"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "Ret region"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr "Amt"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr "Ret amt"
@@ -24936,15 +25747,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "Storby"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "Ret storby"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "By"
@@ -24952,10 +25763,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "Ret By"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "Forstad"
@@ -24963,25 +25774,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "Ret forstad"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Mindre by"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Ret mindre by"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "Landsby"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "Ret landsby"
@@ -24989,5 +25800,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr "Egn"
@@ -24995,10 +25806,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr "Ret lokalitet"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "Ø"
@@ -25006,10 +25817,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Ret ø"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr ""
@@ -25017,5 +25828,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr ""
@@ -25023,5 +25834,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "Huleindgang"
@@ -25029,10 +25840,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "Ret huleindgang"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Tinde"
@@ -25040,10 +25851,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Ret tinde"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "Gletsjer"
@@ -25051,10 +25862,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "Ret gletsjer"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "Vulkan"
@@ -25062,70 +25873,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "Ret vulkan"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Grænser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "National"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "Ret landegrænser"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "Administrativt"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "Ret administrativ grænse"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr "Ret civil-grænse"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr "Politisk"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "Ret politisk grænse"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr "Nationalpark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "Ret grænser for nationalpark"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Brug af land"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Træ"
@@ -25134,15 +25945,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Ret et træ"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "Botanisk navn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "Naturskov"
@@ -25151,5 +25962,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "Ret naturskov"
@@ -25157,17 +25968,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "Nåleskov"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "Løvskov"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "blandet"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "Skov"
@@ -25176,14 +25987,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "Ret skovområde"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "Ret naturreservat"
@@ -25191,25 +26002,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr "Ur"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr "Ret ur"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr "Krat"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr "Ret krat"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr "Fjeldområde"
@@ -25217,10 +26028,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr "Ret fjeldområde"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr "Hede"
@@ -25228,5 +26039,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "Ret hede"
@@ -25234,5 +26045,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr "Gårdsplads"
@@ -25241,45 +26052,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr "Ret gårdsplads"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "Jordbrugsland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr "Ret landbrugsland"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr "Eng"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "Ret vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr "Kolonihaver"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr "Ret kolonihave-område"
@@ -25287,25 +26098,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "Have"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "Ret have"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "Græs"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr ""
@@ -25313,10 +26124,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr ""
@@ -25324,20 +26135,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "Ret park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr "Rekreativt område"
@@ -25345,5 +26156,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr "Ret rekreativt område"
@@ -25351,25 +26162,25 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "Beboelseområde"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
-msgstr "Kirkegård"
+msgstr "Gravplads"
 
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
-msgstr "Ret kirkegård"
-
-#: build/trans_presets.java:2942
+msgstr "Ret gravplads"
+
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -25377,39 +26188,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "Ret kirkegård"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "Detailhandel"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr "Ret område for detailhandel"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "Industri"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr "Ret industri-område"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr ""
@@ -25417,15 +26228,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "Militært område"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr "Ret militært område"
@@ -25433,50 +26244,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "Byggeplads"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "Ret område for byggeplads"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr "Losseplads"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr "Ret losseplads"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "Stenbrud"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "Ret stenbrudsområde"
@@ -25486,5 +26297,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr "Ret multipolygon"
@@ -25493,10 +26304,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr "ydre segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr "indre segment"
@@ -25504,5 +26315,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr ""
@@ -25511,5 +26322,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -25517,34 +26328,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr "ingen_venstre_sving"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr "ingen_højre_sving"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr "ingen_lige_ud"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr "ingen_u_vendinger"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr "kun_højre_sving"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr "kun_venstre_sving"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr "kun_lige_ud"
@@ -25553,15 +26364,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr "fra vej"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr "til vej"
@@ -25569,5 +26380,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr "Rute"
@@ -25576,5 +26387,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr "Ret rute"
@@ -25582,5 +26393,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr "Rutetype"
@@ -25671,5 +26482,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -25679,17 +26490,17 @@
 msgstr "cykel"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr "vej"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr "færge"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr "ski"
@@ -25749,5 +26560,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -25756,9 +26567,9 @@
 msgstr "fod"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr "sporvogn"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr "omvej"
@@ -25772,10 +26583,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "undergrundsbane"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr "Symbol beskrivelse"
@@ -25783,31 +26594,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr "Netværk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr "foreslået"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr "skiftende"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr "midlertidig"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr "forbindelse"
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr "Farve (hex)"
@@ -25816,107 +26627,32 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr "rute-segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 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 "standard"
 
 #. mappaint style named "standard"
@@ -26452,77 +27188,4 @@
 msgid "highway_track"
 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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
-msgstr "bane"
 
 #. color rail
@@ -26910,7 +27573,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "baptistisk"
+msgstr ""
 
 #. color manmade
@@ -30049,219 +30711,4 @@
 msgstr "Sicilen - Italien"
 
-#~ msgid "The plugin could not be removed. Probably it was already disabled"
-#~ msgstr ""
-#~ "Udvidelsen kunne ikke fjernes. Den er sandsynligvis allerede slået fra"
-
-#~ msgid "Bridleway"
-#~ msgstr "Ridesti"
-
-#~ msgid "Cycleway"
-#~ msgstr "Cykelsti"
-
-#~ msgid "Footway"
-#~ msgstr "Gangsti"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Spor-niveau 1"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Ret et spor af første niveau"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Spor-niveau 2"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Ret et spor af andet niveau"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Spor-niveau 3"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Ret et spor af tredje niveau"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Spor-niveau 4"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Ret et spor af fjerde niveau"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Spor-niveau 5"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Ret et spor af femte niveau"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Ret vandring"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "Bjergvandring"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Ret bjergvandring"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Ret krævende bjergvandring"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Ret alpevandring"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Ret krævende alpevandring"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Ret hård alpevandring"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "Id > 0 påkrævet. Fik {0}."
-
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "Parameter ''{0}'' må ikke være nul"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parameteren ''{0}'' må ikke være en null-værdi"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "Forventede instans af OsmDataLayer eller GpxLayer. Fik ''{0}''."
-
-#~ msgid ""
-#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
-#~ "This can lead to nodes being deleted accidentally.\n"
-#~ "Are you really sure to continue?"
-#~ msgstr ""
-#~ "De(n) valgte vej(e) har punkter udenfor den downloadede data region.\n"
-#~ "Dette kan bevirke at nogle punkter bliver slettet uhensigtsmæssigt.\n"
-#~ "Er du virkelig sikker på at du vil fortsætte?"
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "Parameter ''{0}'' må ikke være tom"
-
-#~ msgid "Expected array of length 4, got {0}"
-#~ msgstr "Forventede array med længden 4. Fik {0}"
-
-#~ msgid "Exactly four doubles excpected in string, got {0}"
-#~ msgstr "Præcist fire doubles forventet i streng. Fik {0}."
-
-#~ msgid "Illegal double value ''{0}''"
-#~ msgstr "Ulovlig double værdi {0}"
-
-#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
-#~ msgstr "Parameter ''{0}'' > 0.0 forventet, fik {1}"
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "Forventet ID >= 0. Fik {0}."
-
-#~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
-#~ msgstr "Parameter \"{0}\" >= 0 forventet. Fik {1}."
-
-#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-#~ msgstr "Parameteren \"{0}\" er ikke et gyldigt typenavn. Fik {1}."
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "Parameteren \"{0}\" er ikke en acceptabel klasse. Fik {1}."
-
-#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
-#~ msgstr "Parameter \"{0}\" > 0 forventet. Fik {1}."
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr "Parameter \"{0}\" i intervallet 0..{1} forventedes. Fik {2}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "Parameteren ''{0}'' > 0 forventet. Fik {1}."
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "Parameter ude af intervalområde. Fik {0}."
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "Uventet kolonne-indeks. Fik {0}"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "Parameteren 'col' skal være 0 eller 1. Fik {0}"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "Parameter ''{0}'' må ikke være tom."
-
-#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
-#~ msgstr "Parameter \"{0}\" med tags for præcist en nøgle forventet. Fik {1}."
-
-#~ msgid "Dialog not created yet. Invoke createInstance() first"
-#~ msgstr "Dialog ikke oprettet endnu. Start createInstance() først"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Open"
-#~ msgstr "Åbn"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Closed"
-#~ msgstr "Lukket"
-
-#~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
-#~ msgstr "Forventede heltalsværdi > 0 for parameter ''{0}''. Fik ''{1}''"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Konflikt i data"
-
-#~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
-#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
-#~ "the new role?</html>"
-#~ msgstr ""
-#~ "<html>Du giver {0} primitiver en tom rolle.<br>Dette svarer til at slette "
-#~ "disse primitivers roller.<br>Ønsker du virkelig at anvende den nye rolle?"
-#~ "</html>"
-
-#~ msgid "Value of child.getId() > 0 expected. Got {1}."
-#~ msgstr "Værdi af child.getId() > 0 forventet. Fik {1}."
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
-#~ msgstr "Parameter ''{0}'' > 0 forventet. Fik {1}"
-
-#~ msgid "id in parameter ''{0}'' > 0 expected, got {1}."
-#~ msgstr "ID i parameter ''{0}'' > 0 forventet. Fik {1}."
-
-#~ msgid "Object id > 0 expected. Got {0}"
-#~ msgstr "Objekt-ID > 0 forventet. Fik {0}"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "billede"
-#~ msgstr[1] "billeder"
-
-#~ msgid "Illegal value for attribute ''uid''. Got ''{0}''."
-#~ msgstr "Ulovlig værdi af attribut ''UID''. Fik ''{0}''."
-
-#~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-#~ msgstr "Forventede instans af OsmDataLayer. Fik ''{0}''."
-
-#~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "ID parameter ''{0}'' > 0 forventet. Fik ''{1}''."
-
-#~ msgid "Expected value of type integer > 0 for parameter ''{0}'', got {1}"
-#~ msgstr "Forventet værdi af type heltal > 0 for parameter ''{0}'', Fik {1}"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-#~ msgstr "Parameter ''{0}'' >= 0 forventet. Fik ''{1}''."
-
-#~ msgid "Expected value > 0 for parameter ''{0}'', got {1}"
-#~ msgstr "Forventet værdi > 0 for parameter ''{0}''. Fik {1}."
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "Udvidelsen {0} kræver at JOSM skal opdateres til version {1}."
-
-#~ msgid "<html>"
-#~ msgstr "<html>"
-
-#~ msgid "Expected unique id > 0 for primitive id, got {0}"
-#~ msgstr "Forventede unik ID > 0 for primitiv-ID. Fik {0}."
-
-#~ msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}"
-#~ msgstr "Forventede værdi af type long > 0 for parameter ''{0}''. Fik {1}."
-
-#~ msgid "Parameter ''{0}'' of type node expected, got ''{1}''"
-#~ msgstr "Parameter ''{0}'' af type node forventet. Fik ''{1}''"
-
 #~ msgid "Move"
 #~ msgstr "Flyt"
@@ -30411,4 +30858,9 @@
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "Der er intet EXIF-tidspunkt i filen \"{0}\"."
+
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "billede"
+#~ msgstr[1] "billeder"
 
 #~ msgid "Time entered could not be parsed."
@@ -30587,4 +31039,10 @@
 #~ msgstr "osmarender-indstillinger"
 
+#~ msgid "Boat"
+#~ msgstr "Båd"
+
+#~ msgid "Motorboat"
+#~ msgstr "Motorbåd"
+
 #~ msgid "Unsaved Changes"
 #~ msgstr "Ugemte ændringer"
@@ -30624,7 +31082,4 @@
 #~ msgid "NullPointerException, possibly some missing tags."
 #~ msgstr "NullPointerException, måske på grund af manglende tags."
-
-#~ msgid "Station"
-#~ msgstr "Station"
 
 #~ msgid "Edit Station"
@@ -30711,4 +31166,43 @@
 #~ msgstr "Beklager, virker ikke med anonyme brugere"
 
+#~ msgid "Bridleway"
+#~ msgstr "Ridesti"
+
+#~ msgid "Cycleway"
+#~ msgstr "Cykelsti"
+
+#~ msgid "Footway"
+#~ msgstr "Gangsti"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "Spor-niveau 3"
+
+#~ msgid "Track Grade 2"
+#~ msgstr "Spor-niveau 2"
+
+#~ msgid "Track Grade 1"
+#~ msgstr "Spor-niveau 1"
+
+#~ msgid "Edit Hiking"
+#~ msgstr "Ret vandring"
+
+#~ msgid "Track Grade 5"
+#~ msgstr "Spor-niveau 5"
+
+#~ msgid "Track Grade 4"
+#~ msgstr "Spor-niveau 4"
+
+#~ msgid "Edit Demanding Mountain Hiking"
+#~ msgstr "Ret krævende bjergvandring"
+
+#~ msgid "Mountain Hiking"
+#~ msgstr "Bjergvandring"
+
+#~ msgid "Edit Mountain Hiking"
+#~ msgstr "Ret bjergvandring"
+
+#~ msgid "Edit Alpine Hiking"
+#~ msgstr "Ret alpevandring"
+
 #~ msgid "Upload to OSM..."
 #~ msgstr "Send til OSM..."
@@ -30774,7 +31268,4 @@
 #~ msgid "Hint: Some changes came from uploading new data to the server."
 #~ msgstr "Tip: Nogle ændringer kom ved afsendingen af nyt data til serveren"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Vælg venligst veje med næsten rette vinkler at gøre retvinklet."
 
 #~ msgid ""
@@ -30871,7 +31362,4 @@
 #~ msgstr "Forskydning mellem spor og billeder: {0}m {1}s"
 
-#~ msgid "Public"
-#~ msgstr "Offentlig"
-
 #~ msgid "help"
 #~ msgstr "hjælp"
@@ -30885,4 +31373,25 @@
 #~ msgid "aqueduct"
 #~ msgstr "akvædukt"
+
+#~ msgid "Edit Track of grade 1"
+#~ msgstr "Ret et spor af første niveau"
+
+#~ msgid "Edit Track of grade 2"
+#~ msgstr "Ret et spor af andet niveau"
+
+#~ msgid "Edit Track of grade 3"
+#~ msgstr "Ret et spor af tredje niveau"
+
+#~ msgid "Edit Track of grade 4"
+#~ msgstr "Ret et spor af fjerde niveau"
+
+#~ msgid "Edit Track of grade 5"
+#~ msgstr "Ret et spor af femte niveau"
+
+#~ msgid "Edit Demanding Alpine Hiking"
+#~ msgstr "Ret krævende alpevandring"
+
+#~ msgid "Edit Difficult Alpine Hiking"
+#~ msgstr "Ret hård alpevandring"
 
 #~ msgid "Edit Drawbridge"
@@ -31107,4 +31616,7 @@
 #~ msgstr "veje"
 
+#~ msgid ">"
+#~ msgstr ">"
+
 #~ msgid "Login name (e-mail) to the OSM account."
 #~ msgstr "Login-navn (e-mail) til OSM-kontoen."
@@ -31115,4 +31627,7 @@
 #~ msgid "Version number missing from OSM data"
 #~ msgstr "Versionsnummer mangler fra OSM-data."
+
+#~ msgid "Plugin {0} requires JOSM update to version {1}."
+#~ msgstr "Udvidelsen {0} kræver at JOSM skal opdateres til version {1}."
 
 #~ msgid "Optional"
@@ -31144,4 +31659,7 @@
 #~ msgid "No data"
 #~ msgstr "Intet data"
+
+#~ msgid "Conflicts in data"
+#~ msgstr "Konflikt i data"
 
 #~ msgid "Download referrers from OSM..."
@@ -31189,7 +31707,47 @@
 #~ msgstr "Kunne ikke læse \"{0}\""
 
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr "Forventede instans af OsmDataLayer eller GpxLayer. Fik ''{0}''."
+
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "Parameter ''{0}'' må ikke være nul"
+
+#~ msgid ""
+#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
+#~ "This can lead to nodes being deleted accidentally.\n"
+#~ "Are you really sure to continue?"
+#~ msgstr ""
+#~ "De(n) valgte vej(e) har punkter udenfor den downloadede data region.\n"
+#~ "Dette kan bevirke at nogle punkter bliver slettet uhensigtsmæssigt.\n"
+#~ "Er du virkelig sikker på at du vil fortsætte?"
+
 #~ msgid "At least one object to delete requird, got empty collection"
 #~ msgstr "Mindst et objekt at slette krævet. Har tom samling."
 
+#~ msgid "Parameter ''{0}'' must not be empty"
+#~ msgstr "Parameter ''{0}'' må ikke være tom"
+
+#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+#~ msgstr "Parameter ''{0}'' > 0.0 forventet, fik {1}"
+
+#~ msgid "Illegal double value ''{0}''"
+#~ msgstr "Ulovlig double værdi {0}"
+
+#~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
+#~ msgstr "Parameter \"{0}\" >= 0 forventet. Fik {1}."
+
+#~ msgid "Expected ID >= 0. Got {0}."
+#~ msgstr "Forventet ID >= 0. Fik {0}."
+
+#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
+#~ msgstr "Parameter \"{0}\" > 0 forventet. Fik {1}."
+
+#~ msgid "Parameter ''{0}'' must not be empty."
+#~ msgstr "Parameter ''{0}'' må ikke være tom."
+
+#~ msgctxt "changeset.open"
+#~ msgid "Closed"
+#~ msgstr "Lukket"
+
 #~ msgid "Looking up available translations..."
 #~ msgstr "Kigger efter tilgængelige oversættelser..."
@@ -31197,4 +31755,7 @@
 #~ msgid "Please restart JOSM."
 #~ msgstr "Genstart venligst JOSM."
+
+#~ msgid "<html>"
+#~ msgstr "<html>"
 
 #~ msgid ""
@@ -31207,4 +31768,40 @@
 #~ "      Java option for at øge den tildelte hukommelses maksimumstørrelse."
 
+#~ msgid "Parameter current out of range. Got {0}."
+#~ msgstr "Parameter ude af intervalområde. Fik {0}."
+
+#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
+#~ msgstr "Parameter \"{0}\" med tags for præcist en nøgle forventet. Fik {1}."
+
+#~ msgid "Dialog not created yet. Invoke createInstance() first"
+#~ msgstr "Dialog ikke oprettet endnu. Start createInstance() først"
+
+#~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
+#~ msgstr "Forventede heltalsværdi > 0 for parameter ''{0}''. Fik ''{1}''"
+
+#~ msgid ""
+#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
+#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
+#~ "the new role?</html>"
+#~ msgstr ""
+#~ "<html>Du giver {0} primitiver en tom rolle.<br>Dette svarer til at slette "
+#~ "disse primitivers roller.<br>Ønsker du virkelig at anvende den nye rolle?"
+#~ "</html>"
+
+#~ msgid "Value of child.getId() > 0 expected. Got {1}."
+#~ msgstr "Værdi af child.getId() > 0 forventet. Fik {1}."
+
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "parameteren ''{0}'' må ikke være en null-værdi"
+
+#~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
+#~ msgstr "Parameter ''{0}'' > 0 forventet. Fik {1}"
+
+#~ msgid "Object id > 0 expected. Got {0}"
+#~ msgstr "Objekt-ID > 0 forventet. Fik {0}"
+
+#~ msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+#~ msgstr "ID i parameter ''{0}'' > 0 forventet. Fik {1}."
+
 #~ msgid ""
 #~ "Login password to the OSM account. Leave blank to not store any password."
@@ -31237,6 +31834,14 @@
 #~ "nogle data før --selection"
 
+#~ msgctxt "changeset.open"
+#~ msgid "Open"
+#~ msgstr "Åbn"
+
 #~ msgid "Delete old plugin file {0}"
 #~ msgstr "Slet gammel udvidelsesfil {0}"
+
+#~ msgid "The plugin could not be removed. Probably it was already disabled"
+#~ msgstr ""
+#~ "Udvidelsen kunne ikke fjernes. Den er sandsynligvis allerede slået fra"
 
 #~ msgid "Update Plugins"
@@ -31255,2 +31860,56 @@
 #~ msgid "Plug-in named {0} is not available. Update skipped."
 #~ msgstr "Udvidelsen {0} er ikke tilgængelig. Opdatering sprunget over."
+
+#~ msgid "Expected array of length 4, got {0}"
+#~ msgstr "Forventede array med længden 4. Fik {0}"
+
+#~ msgid "Exactly four doubles excpected in string, got {0}"
+#~ msgstr "Præcist fire doubles forventet i streng. Fik {0}."
+
+#~ msgid "Id > 0 required, got {0}"
+#~ msgstr "Id > 0 påkrævet. Fik {0}."
+
+#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "Parameteren ''{0}'' > 0 forventet. Fik {1}."
+
+#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
+#~ msgstr "Parameter \"{0}\" i intervallet 0..{1} forventedes. Fik {2}"
+
+#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
+#~ msgstr "Parameteren \"{0}\" er ikke et gyldigt typenavn. Fik {1}."
+
+#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
+#~ msgstr "Parameteren \"{0}\" er ikke en acceptabel klasse. Fik {1}."
+
+#~ msgid "Unexpected column index. Got {0}."
+#~ msgstr "Uventet kolonne-indeks. Fik {0}"
+
+#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
+#~ msgstr "Parameteren 'col' skal være 0 eller 1. Fik {0}"
+
+#~ msgid "Illegal value for attribute ''uid''. Got ''{0}''."
+#~ msgstr "Ulovlig værdi af attribut ''UID''. Fik ''{0}''."
+
+#~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+#~ msgstr "Forventede instans af OsmDataLayer. Fik ''{0}''."
+
+#~ msgid "Expected value of type integer > 0 for parameter ''{0}'', got {1}"
+#~ msgstr "Forventet værdi af type heltal > 0 for parameter ''{0}'', Fik {1}"
+
+#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
+#~ msgstr "Parameter ''{0}'' >= 0 forventet. Fik ''{1}''."
+
+#~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "ID parameter ''{0}'' > 0 forventet. Fik ''{1}''."
+
+#~ msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}"
+#~ msgstr "Forventede værdi af type long > 0 for parameter ''{0}''. Fik {1}."
+
+#~ msgid "Parameter ''{0}'' of type node expected, got ''{1}''"
+#~ msgstr "Parameter ''{0}'' af type node forventet. Fik ''{1}''"
+
+#~ msgid "Expected value > 0 for parameter ''{0}'', got {1}"
+#~ msgstr "Forventet værdi > 0 for parameter ''{0}''. Fik {1}."
+
+#~ msgid "Expected unique id > 0 for primitive id, got {0}"
+#~ msgstr "Forventede unik ID > 0 for primitiv-ID. Fik {0}."
Index: applications/editors/josm/i18n/po/de.po
===================================================================
--- applications/editors/josm/i18n/po/de.po	(revision 19689)
+++ applications/editors/josm/i18n/po/de.po	(revision 19698)
@@ -9,7 +9,7 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-19 00:01-0500\n"
-"PO-Revision-Date: 2010-01-18 23:32-0500\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-31 08:13+0000\n"
+"Last-Translator: Andre Hinrichs <andre.hinrichs@gmx.de>\n"
 "Language-Team: Deutsch\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-01-13 18:27+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:34+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -71,11 +71,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -243,5 +243,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -255,13 +255,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -270,5 +270,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -296,5 +299,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Vereinen"
@@ -325,5 +328,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -390,9 +393,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -400,5 +403,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "OK"
@@ -449,6 +454,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -466,5 +471,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -473,11 +478,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -514,5 +519,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "Konflikt"
@@ -647,14 +652,14 @@
 msgstr "Bitte wählen Sie mindestens zwei Wege zum Verbinden."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Kopie"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Gewählte Objekte in die Zwischenablage kopieren."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Bitte etwas zum Kopieren auswählen."
@@ -687,8 +692,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -697,5 +702,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -781,4 +786,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -788,4 +795,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Auswahl durch Kopieren und sofortiges Einfügen duplizieren."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Weg duplizieren"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "Die ausgewählte Relation bearbeiten"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "Ebene: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "Auf {0} zoomen"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr ""
 
 #. <button label="Info" hotkey="I">
@@ -974,5 +1009,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:80
 msgid "Join Node and Line"
-msgstr "Knoten und Linie vereinigen"
+msgstr "Knotenpunkt und Linie vereinigen"
 
 #: ../core/src/org/openstreetmap/josm/actions/JosmAction.java:46
@@ -1001,5 +1036,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "URL"
@@ -1151,5 +1186,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+#, fuzzy
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr "<html>Kann Verzeichnis nicht öffnen.<br>Bitte eine Datei auswählen!"
 
@@ -1221,8 +1257,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
-msgid ""
-"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 "
+#, fuzzy
+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.)"
@@ -1243,5 +1280,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "Knoten so verschieben, dass alle Winkel 90 oder 270 Grad sind"
 
@@ -1283,4 +1321,9 @@
 "Projektion zum Ausschalten dieser Warnung.<br>Wollen Sie fortfahren?</html>"
 
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+#, fuzzy
+msgid "Selection must consist only of ways and nodes."
+msgstr "Ein Multipolygon darf nur aus geschlossenen Wegen bestehen."
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
 msgid "Orthogonalize"
@@ -1295,4 +1338,14 @@
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "Die ausgewählten Objekte können nicht rechtwinklig angeordnet werden"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1400,18 +1453,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1436,12 +1489,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Fehler"
@@ -1576,5 +1630,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1836,5 +1890,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr "Daten herunterladen"
@@ -2176,5 +2230,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:356
 msgid "Cannot add a node outside of the world."
-msgstr "Kann keinen Knoten außerhalb der Welt erstellen."
+msgstr "Außerhalb der Welt können keine Knoten erstellt werden."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:531
@@ -2274,6 +2328,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2397,5 +2451,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Nach Objekten suchen."
@@ -2606,5 +2660,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Suche"
@@ -2645,5 +2699,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
@@ -2651,5 +2705,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
@@ -2657,10 +2711,10 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
 msgstr "RX"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2673,10 +2727,10 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 "Schlüssel kann bei Gleichheitsoperator nicht leer sein. Beispiel: feld=wert"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -3384,5 +3438,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3390,5 +3444,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3396,5 +3450,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3402,5 +3456,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3538,19 +3592,19 @@
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Ein Objekt mit ID=0 darf nicht unsichtbar sein."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "ID >= 0 erwartet, jedoch {0} erhalten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "Version > 0 erwartet, jedoch {0} erhalten."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3561,5 +3615,5 @@
 "Änderungssatznummer ist {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3567,5 +3621,5 @@
 msgstr "Zusammenfügen nicht möglich, weil neue und alte Objekte enthalten sind"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3696,14 +3750,14 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
 msgid_plural "nodes"
-msgstr[0] "Knoten"
-msgstr[1] "Knoten"
+msgstr[0] "Knotenpunkt"
+msgstr[1] "Knotenpunkte"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3714,7 +3768,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3736,5 +3790,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "Hintergrund"
@@ -3882,6 +3936,6 @@
 msgstr "Nicht noch einmal zeigen (speichert Auswahl)"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3889,37 +3943,38 @@
 msgstr " [ID: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "unvollständig"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "Straße"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "Eisenbahn"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "Gewässer"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "Landfläche"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3928,10 +3983,10 @@
 msgstr[1] "{0} Knoten"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr "Öffentliche Verkehrsmittel"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3940,5 +3995,5 @@
 msgstr[1] "{0} Elemente"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3975,6 +4030,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Konflikt"
@@ -3985,8 +4040,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-msgid "Authorization Failed"
+msgid "Authorisation Failed"
 msgstr "Autorisierung fehlgeschlagen"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
+#, fuzzy
 msgid "Authentication failed"
 msgstr "Authentifizierung fehlgeschlagen"
@@ -4198,5 +4254,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Initialisieren"
@@ -4237,5 +4292,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4246,5 +4301,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -4315,29 +4370,29 @@
 msgstr "Skala"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Die geographische Länge an der Mausposition."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 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:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Die geographische Breite an der Mausposition."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 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:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 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:106
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 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:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4347,9 +4402,9 @@
 "halten, um mit der Maus aus der Liste zu wählen.<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(kein Objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4588,16 +4643,16 @@
 msgstr "Konfliktlösung"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr "Liste in Role {0} nimmt aktuell nicht an einem Vergleichspaar teil."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "Parameter \"index\" hat unerwarteten Wert {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4812,9 +4867,15 @@
 msgstr "Knoten"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 "Vereinigte Knoten sind noch nicht fixiert. Konfliktlösung kann nicht "
 "ausgeführt werden."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
+"Knoten {0} kann nicht zum Weg hinzugefügt werden, weil er gelöscht wurde"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4976,5 +5037,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr "Nein, abbrechen"
@@ -5025,5 +5086,11 @@
 msgstr "Objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+"Objekt {0} kann nicht zur Relation hinzugefügt werden, weil es gelöscht wurde"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -5155,10 +5222,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "Kein"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "alle"
@@ -5239,7 +5306,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -5249,6 +5316,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5457,10 +5524,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5480,18 +5547,18 @@
 msgstr "Befehlsliste: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr "Konflikte auflösen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Auflösen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr "Dialog-Fenster mit den gewählten Objekten aus der obigen Liste öffnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5522,19 +5589,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216
-#, fuzzy, java-format
+#, 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.Click <strong>{0}</strong> to close anyway."
+"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>Sie haben das Zusammenführen der Unterschiede in diesem Konflikt nicht "
-"beendet.<br>Konfliktlösungen werden nicht aktiviert, solange nicht alle "
-"Unterschiede gelöst sind.<br>Wählen Sie <strong>'{0}'</strong>, um trotzdem "
-"zu schließen. <strong>Bereits<br>gelöste Unterschiede werden nicht angewandt."
-"</strong><br>Wählen Sie <strong>{1}</strong>, um zur Konfliktlösung "
-"zurückzukehren.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224
@@ -5556,5 +5617,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5563,5 +5624,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5641,43 +5702,48 @@
 msgstr "Geschichte der markierten Elemente anzeigen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Ebenen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 msgid "Open a list of all loaded layers."
 msgstr "Liste aller geladenen Ebenen öffnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr "Ausgewählte Ebenen löschen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Anzeigen/Ausblenden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr "Aktivieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr "Die ausgewählte Ebene aktivieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr "Aktuelle Ebene mit einer anderen Ebene verbinden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Weg duplizieren"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 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:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Gewählte Ebene eine Zeile nach unten verschieben."
@@ -5691,6 +5757,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Relationen"
@@ -5700,22 +5766,22 @@
 msgstr "Eine Liste aller Relationen öffnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relationen: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Editor für die gewählte Relation öffnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Gewählte Relation löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Eine neue Relation erstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
@@ -5724,47 +5790,47 @@
 "öffnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr "Ersetze die aktuelle Auswahl durch die selektierten Relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr "Wählen Sie die Mitglieder aller ausgewählten Relationen aus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr "Mitglieder auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr "Alle Mitglieder der ausgewählten Relationen laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr "Elemente herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Aktuelle Auswahl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Ein Fenster mit der aktuellen Auswahl öffnen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Auf ausgewählte Elemente zoomen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Auf Auswahl zoomen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Ausw.: Rel.:{0}/Wege:{1}/Knoten:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5772,5 +5838,5 @@
 msgstr "Auswahl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -6139,8 +6205,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -6212,4 +6276,7 @@
 #. <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 />
@@ -6288,6 +6355,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6329,6 +6397,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6797,152 +6867,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Name"
@@ -7362,5 +7434,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<unterschiedlich>"
@@ -7415,55 +7487,55 @@
 msgstr "Eigenschaften hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Eigenschaften: {0} / Mitgliedschaften: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Eigenschaften / Mitgliedschaften"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Relation ändern"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "Aus der Relation entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Auswahl wirklich aus Relation {0} entfernen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Den gewählten Schlüssel von allen Objekten entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "Eigenschaften entfernen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Neues Paar aus Schlüssel und Wert zu allen Objekten hinzufügen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Den Wert des Schlüssels für alle Objekte bearbeiten"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr "Relation auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr "Relation in Hauptauswahl übernehmen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr "In Relationsliste auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr "Relation in Relationsliste auswählen."
@@ -7633,5 +7705,5 @@
 "member"
 msgstr ""
-"Alle ausgewählten Primitiven im momentanen Datensatz vor dem ersten "
+"Alle ausgewählten Objekte im momentanen Datensatz vor dem ersten "
 "ausgewählten Element hinzufügen"
 
@@ -7657,6 +7729,5 @@
 msgid ""
 "Select relation members which refer to primitives in the current selection"
-msgstr ""
-"Wählen Sie Relationselemente aus, die in der aktuellen Auswahl vorkommen"
+msgstr "Alle Elemente auswählen, die in der aktuellen Auswahl vorkommen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
@@ -7666,6 +7737,6 @@
 "selection"
 msgstr ""
-"Wählen Sie Relationselemente aus, die in den {0} Elementen der aktuellen "
-"Auswahl vorkommen"
+"Alle Elemente auswählen, die in den {0} Elementen der aktuellen Auswahl "
+"vorkommen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861
@@ -7717,5 +7788,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965
 msgid "Remove the currently selected members from this relation"
-msgstr "Das aktuell ausgewählte Element aus dieser Beziehung entfernen"
+msgstr "Das ausgewählte Element aus dieser Relation entfernen"
 
 #. putValue(NAME, tr("Remove"));
@@ -7726,5 +7797,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984
 msgid "Delete the currently edited relation"
-msgstr "Die aktuell bearbeitete Beziehung löschen"
+msgstr "Diese Relation löschen"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1074
@@ -7917,5 +7988,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
 msgid "Load relation"
-msgstr "Beziehung wurde geladen"
+msgstr "Relation laden"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
@@ -7945,30 +8016,30 @@
 "der Relation verbunden"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Lesezeichen"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr "<html>Es ist kein Ladebereich ausgewählt.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+#, fuzzy
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
 msgstr ""
 "<html><strong>Aktueller Ladebereich</strong> (min. Breite, min. Länge, max. "
 "Br., max. Län.): {0}, {1}, {2}, {3}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr "Lesezeichen erstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:185
 msgid "Add a bookmark for the currently selected download area"
 msgstr "Fügen Sie ein Lesezeichen für den aktuellen Ladebereich hinzu"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:192
 msgid ""
 "Currently, there is no download area selected. Please select an area first."
@@ -7977,19 +8048,19 @@
 "aus."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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 "Bitte geben Sie einen Namen für das Lesezeichen ein."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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 "Name des Ortes"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:217
 msgid "Remove the currently selected bookmarks"
 msgstr "Entfernt die ausgewählten Lesezeichen"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr "Benennt das ausgewählte Lesezeichen um"
@@ -8117,18 +8188,18 @@
 "wollen.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr "Klassentyp"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr "Grenzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr "In der Nähe von"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -8139,34 +8210,34 @@
 msgstr "Folgenden Server für Suche benutzen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
 msgid "Enter a place name to search for:"
 msgstr "Bitte den Ortsnamen eingeben, nach dem gesucht werden soll:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:112
 msgid "Enter a place name to search for"
 msgstr "Bitte den Ortsnamen eingeben, nach dem gesucht werden soll."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:148
 msgid "Areas around places"
 msgstr "Ladebereich um bestimmte Orte"
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Nullzeiger-Ausnahme, vielleicht fehlende Merkmale."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr "Suchen..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr "Klicken, um die Suche nach Orten zu starten"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr "Suche nach Namen"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr "Suche nach Namen ..."
@@ -8177,7 +8248,9 @@
 #. 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" />
@@ -8186,10 +8259,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Typ"
@@ -8198,5 +8272,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -8208,17 +8282,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "unbekannt"
@@ -8608,5 +8681,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr "Konflikte gefunden"
@@ -9115,9 +9188,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -9127,7 +9200,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -9139,16 +9212,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "Ebene"
@@ -9614,68 +9687,68 @@
 msgstr[1] "{0} zu löschende Objekte:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "GPS-Punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Linienaussehen anpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../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:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Farben anpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Voreinstellung"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Farbe auswählen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr "Marken von benannten Punkten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Benannte GPS-Punkte von {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Audio importieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9688,23 +9761,23 @@
 "Audiodaten verknüpft werden.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr "Import nicht möglich"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Audio-Dateien im Wave-Format (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Audio-Marken von {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Bilder importieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9717,5 +9790,5 @@
 "Bildern verknüpft werden.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9723,5 +9796,5 @@
 msgstr "Name: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9729,5 +9802,5 @@
 msgstr "Beschreibung: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9737,23 +9810,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr "Zeitraum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr "Länge"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Länge: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9762,5 +9835,5 @@
 msgstr[1] "{0} Routen, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9769,10 +9842,10 @@
 msgstr[1] "{0} Wegpunkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Zur Daten-Ebene konvertieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9782,43 +9855,43 @@
 "<br>Weitere Informationen, falls Sie die GPX-Spur hochladen möchten:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Konvertiert von: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "OSM-Daten entlang der GPS-Spur herunterladen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Alles im Bereich herunterladen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} Meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "Maximalgebiet je Anfrage:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9829,5 +9902,5 @@
 "fortfahren?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
@@ -9835,5 +9908,5 @@
 "werden kann."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9843,5 +9916,5 @@
 "wurden ignoriert oder an den Anfang verschoben."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9851,24 +9924,24 @@
 "der GPS-Spur entfernt waren, wurden ignoriert."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datenebene {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "Außerhalb des heruntergeladenen Bereichs"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr "Version {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 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:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9877,5 +9950,5 @@
 msgstr[1] "{0} Konflikte wurden entdeckt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9895,5 +9968,5 @@
 "dem Server gelöscht wurden."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9910,11 +9983,11 @@
 "Dialog und lösen Sie sie manuell."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr "Diesen Dialog schließen und Bearbeitung fortsetzen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9923,32 +9996,32 @@
 msgstr[1] "{0} gelöscht"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} besteht aus:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr "nicht angegeben"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr "API-Version: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Zu GPX-Ebene konvertieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr "Datensatzkonsistenzprüfung"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr "Keine Probleme gefunden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr "Folgende Probleme gefunden:"
@@ -10000,24 +10073,24 @@
 msgstr "GPS-Punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX-Dateien (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, 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:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Fehler beim Einlesen von {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Kann \"{0}\" nicht lesen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10029,34 +10102,34 @@
 "dem Foto und wählen eine Zeitzone<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr "Fotozeit (aus EXIF):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 msgid "Gps time (read from the above photo): "
 msgstr "GPS-Zeit (aus obigem Photo): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr "Ich bin in der Zeitzone von: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "Kein Datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr "Ein anderes Foto öffnen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 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:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -10066,21 +10139,21 @@
 "Bitte verwenden Sie das geforderte Format"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "Ungültiges Datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr "<Bisher keine GPS-Daten geladen>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr "GPS-Spur: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr "Eine andere GPS-Spur laden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
@@ -10089,43 +10162,43 @@
 "Empfängers</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr "Manuell justieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr "Position überschreiben für: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, 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:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, 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:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr "Vorschaubilder auf der Karte anzeigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr "Zeitzone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr "Offset:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr "Keine GPS-Spur ausgewählt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10136,45 +10209,45 @@
 "<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:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr "Bilder mit GPS-Spur korrelieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr "Korrelieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr "Ungültige Zeitzone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr "Ungültiger Offset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr "Erneut versuchen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr "Es gibt keine passenden Bilder!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Zeitzone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuten: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekunden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10183,5 +10256,5 @@
 msgstr[1] "(Zeitunterschied von {0} Tagen)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10192,21 +10265,21 @@
 "synchonisieren."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr "Synchonisieren von Bildern und GPS-Spur fehlgeschlagen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr "Zeitzone und Offset anpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 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:951
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr "Bilder enthalten keine Zeitinformation"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10216,17 +10289,17 @@
 "andere."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr "GPS-Spur enthält keine Zeitinformationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr "Wählen Sie eine GPS-Spur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr "Keine GPS-Spur gewählt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -10237,5 +10310,5 @@
 "Erwartetes Format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -10246,56 +10319,56 @@
 "Erwartetes Format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "GPS-Positionen aus EXIF-Daten extrahieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr "Verzeichnisuntersuchen starten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 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:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "Photos lesen..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Einlesen {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, 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:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Verzeichnis {0} untersuchen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, 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:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, 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:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Georeferenzierte Bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr "Mit GPX korrelieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
 #, java-format
 msgid "{0} image loaded."
@@ -10304,5 +10377,5 @@
 msgstr[1] "{0} Bilder geladen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10311,10 +10384,10 @@
 msgstr[1] "{0} wurden als GPS-markiert erkannt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr "Bilddatei von der Platte löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -10325,5 +10398,5 @@
 "</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr "Bilddatei konnte nicht gelöscht werden."
@@ -10420,5 +10493,5 @@
 msgstr "GPS-Markierung"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10426,5 +10499,5 @@
 msgstr[1] "Wegpunkte"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10433,9 +10506,9 @@
 msgstr[1] "{0} besteht aus {1} Wegpunkten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "Ton synchronisieren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10444,20 +10517,20 @@
 "Synchronisationston hören."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr "Ton synchronisiert bei Punkt {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 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:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -10467,5 +10540,5 @@
 "die Marke eingefügt werden soll."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
@@ -10473,13 +10546,13 @@
 "Offset abgeleitet werden könnte."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Texte/Symbole anzeigen/verbergen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 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:171
+#: ../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 "
@@ -10489,5 +10562,5 @@
 "Aufnahme abgespielt werden soll (nach der ersten Marke)."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -10497,5 +10570,5 @@
 "sychronisierende Audio-Marke oder den Wegpunkt bewegt werden."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "Konnte Audio-Marke nicht synchronisieren."
@@ -10521,5 +10594,5 @@
 msgstr "Ungültiges Strichelungsmuster - mindestens ein Wert muss positiv sein"
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
 #, java-format
 msgid ""
@@ -10529,5 +10602,5 @@
 "Fehlermeldung war: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
 #, java-format
 msgid ""
@@ -11221,5 +11294,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Bitte wählen Sie eine Zeile zum Bearbeiten."
@@ -11233,5 +11306,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -11385,9 +11458,4 @@
 msgstr "Zeichenstil {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "Ebene: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -11417,6 +11485,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr "Alle"
@@ -11456,8 +11524,8 @@
 msgstr "Einzelne Farbe (kann für benannte Ebenen angepasst werden)"
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Auto"
@@ -11479,13 +11547,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Fahrrad"
@@ -11518,12 +11586,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "Zu Fuß"
@@ -12580,5 +12648,12 @@
 msgstr "Auswahl in der Merkmalstabelle löschen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -12586,18 +12661,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "Optionale Attribute:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr "geschlossener Weg"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Unbekannter Typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -12608,16 +12683,16 @@
 msgstr "Quelle für Objektvorlage konnte nicht gelesen werden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fehler beim Einlesen von {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, 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:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -12626,18 +12701,17 @@
 msgstr[1] "Ändere {0} Objekte"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "Nichts ausgewählt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "Auswahl unpassend!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "Vorlage anwenden"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Einstellungen ändern"
@@ -12940,6 +13014,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12966,9 +13040,9 @@
 msgstr "Fehler beim Einlesen von Datei \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Fehler: ungültige Dokumentenstruktur in GPX-Dokument"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12991,9 +13065,17 @@
 msgstr "Keine Bilddateien gefunden."
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
 msgstr ""
 "Das Öffnen eines Eingabestroms für die Resource ''{0}'' ist fehlgeschlagen."
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, fuzzy, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+"Warnung: die Nachricht des Tages konnte nicht von ''{0}'' gelesen werden. "
+"Fehlermeldung war: {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
@@ -13066,5 +13148,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "Importierte Koordinaten: "
@@ -13815,5 +13897,5 @@
 #, java-format
 msgid "Failed to create plugin directory ''{0}''"
-msgstr "Das Anlegen eines Plugin-Verzeichnisses ist fehlgeschlagen."
+msgstr "Erstellen des Plugin-Verzeichnisses ''{0}'' fehlgeschlagen"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:162
@@ -14011,6 +14093,6 @@
 "''{1}''. Renaming failed."
 msgstr ""
-"Warnung: Die Installation des Plugins \"{0}\" aus der temporären Datei ist "
-"fehlgeschlagen. Die Datei konnte nicht umbenannt werden."
+"Warnung: Installation des Plugins ''{0}'' von temporär heruntergeladener "
+"Datei ''{1}'' fehlgeschlagen. Umbenennen fehlgeschlagen."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
@@ -14296,6 +14378,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -14451,6 +14533,6 @@
 "genutzt."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -14461,5 +14543,5 @@
 "zugegriffen werden. Die Ausnahme lautet: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -14633,4 +14715,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr "Sichtbarkeit"
@@ -14722,5 +14805,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "Adressinterpolation"
@@ -15353,5 +15436,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr "Ort"
@@ -15522,21 +15605,21 @@
 "Entfernen Sie das Gebiet vor dem Aufteilen aus der Relation."
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr "TangoGPS-Dateien (*.log)"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr "Formatfehler: "
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr "TangoGPS erfolgreich importiert"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr "Fehler beim TangoGPS-Import!"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr "TCX-Dateien (*.tcx)"
@@ -15568,9 +15651,9 @@
 msgstr "Weg duplizieren"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr "Ebene zum Änderung von GPS-Spuren"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr "In GPX-Ebene mit anonymer Zeit konvertieren"
@@ -15585,13 +15668,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr "Weg aus GPX-Ebene importieren"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr "Existierenden Weg verwerfen"
@@ -15600,6 +15683,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr "Keine GPX-Datenebene gefunden."
@@ -15828,17 +15911,17 @@
 msgstr "Einen Satz Bilder als neue Ebene laden."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr "Richtungsindex '{0}' nicht gefunden"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr "Das Startgebiet ist nicht innerhalb der Begrenzung"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:105
 msgid "Looking for shoreline..."
 msgstr "Nach Küstenlinie suchen..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -15882,42 +15965,41 @@
 msgstr "Doppelte Knoten entfernen..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr "Lake Walker Spur"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr "Ein unbekannter Fehler ist aufgetreten"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "Ost"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "Nordost"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "Nord"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "Nordwest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "West"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "Südwest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "Süd"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "Südost"
@@ -15973,6 +16055,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -15981,74 +16063,74 @@
 msgstr "Wasser"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "Küstenlinie"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "Land"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Maximum number of segments per way"
 msgstr "Maximale Anzahl von Abschnitten je Weg"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
 msgid "Maximum number of nodes in initial trace"
 msgstr "Maximale Anzahl von Knoten in der Anfangs-Spur"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Höchster Grauwert, der als Wasser betrachtet wird (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
 msgid "Line simplification accuracy (degrees)"
 msgstr "Genauigkeit beim Vereinfachen von Linien (Grad)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Auflösung der Landsat-Kacheln (Pixel pro Grad)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Größe der Landsat-Kacheln (Pixel)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
 msgid "Shift all traces to east (degrees)"
 msgstr "Alle Spuren nach Osten verschieben (in Grad)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
 msgid "Shift all traces to north (degrees)"
 msgstr "Alle Spuren nach Norden verschieben (in Grad)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
 msgid "Direction to search for land"
 msgstr "Richtung, in der nach Land gesucht werden soll"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
 msgid "Tag ways as"
 msgstr "Wege bezeichnen als"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr "WMS-Ebene"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr "Maximale Speichergröße (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
 msgid "Maximum cache age (days)"
 msgstr "Maximales Speicheralter (Tage)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:68
 msgid "Source text"
 msgstr "Datenquelle"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Maximale Anzahl von Abschnitten in jedem generierten Weg. Standard ist 250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -16058,5 +16140,5 @@
 "Linien vereinfacht werden). Standardwert ist 50.000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -16066,5 +16148,5 @@
 "Landsat IR-1-Daten). Erlaubter Bereich ist 0-255. Standard 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -16075,5 +16157,5 @@
 "0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -16082,21 +16164,21 @@
 "4.000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Größe der Landsat-Kacheln, gemessen in Pixeln. Standard ist 2.000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Alle Punkte nach Osten verschieben (Grad). Standard ist 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Alle Punkte nach Norden verschieben (Grad). Standard ist 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Direction to search for land. Default east."
 msgstr "Richtung in der nach Land gesucht werden soll. Standardmäßig Ost."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
@@ -16104,34 +16186,34 @@
 "Wasser."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "Zum Abzeichnen genutzte WMS-Ebene. Standard ist IR1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "Maximale Größe des Speicherverzeichnisses in Bytes. Standard ist 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 "Maximales Dateialter von gespeicherten Dateien in Tagen. Standard ist 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr "Name der Datenquelle. Standardeinstellung ist Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "Ein Plugin, um Wasserflächen auf Landsat-Bildern zu kennzeichnen."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr "Einstellungen für das LakeWalker-Plugin"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:50
 msgid "Downloading image tile..."
 msgstr "Bildkachel herunterladen..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr "Kann Bild nicht laden"
@@ -16155,5 +16237,5 @@
 msgstr "Verbindung fehlgeschlagen"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr "Kein Name"
@@ -16184,5 +16266,5 @@
 msgstr "Richtung"
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr "Live GPS-Ebene"
@@ -16258,5 +16340,5 @@
 msgstr "Winkel zwischen zwei gewählten Knoten"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr "Ebene für Messungen"
@@ -16538,4 +16620,76 @@
 msgid "Firefox executable"
 msgstr "Firefox-Programm"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#, fuzzy
+msgid "Read error!"
+msgstr "Speicherbecken"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Koordinaten des neuen Knotens eingeben."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Sicherungsdateien erstellen"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Fehler"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "Bilddatei konnte nicht gelöscht werden."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Die Datei ''{0}'' konnte nicht umbenannt werden"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Sicherungsdateien erstellen"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "Sicherungsdateien erstellen"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Überschreiben"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+#, fuzzy
+msgid "Could not delete temporary file!"
+msgstr "Dateien konnten nicht importiert werden."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
@@ -16813,6 +16967,6 @@
 msgstr "Aufgezeichnete Daten jede Minute speichern."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -16938,72 +17092,131 @@
 "Sie müssen zuerst in den Einstellungen eine Quelle für Vorlagen angeben."
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+#, fuzzy
+msgid "Terrace a house"
+msgstr "Gebäude abteilen"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+#, fuzzy
+msgid "Interpolation"
+msgstr "Adressinterpolation"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr "Abschnitte"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Straßen"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Höchste Nummer"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Niedrigste Nummer"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+#, fuzzy
+msgid "Lowest housenumber of the terraced house"
+msgstr "Niedrigste Hausnummer kann nicht größer als höchste Nummer sein"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Eine neue Relation erstellen"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Überlappende Wege löschen"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Straßenname"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr "Gerade/Ungerade"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr "Niedrigste Nummer"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr "Höchste Nummer"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr "Abschnitte"
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr "Niedrigste Hausnummer kann nicht größer als höchste Nummer sein"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr "Hausnummern entsprechen nicht der ungerade oder gerade Einstellung"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr "Der Abschnitt muss eine Zahll größer 1 sein"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr "{0} muss größer als 0 sein"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr "{0} ist keine Zahl"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr "Gebäudeteilung umkehren"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr "Hausnummern der Gebäudeteilung umkehren"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr "Gebäudeteilung umkehren"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:83
+#, fuzzy
+msgid "Cannot reverse!"
+msgstr "nicht vorhanden"
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:125
 msgid "Reverse Terrace"
 msgstr "Gebäudeteilung umkehren"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr "Gebäude abteilen"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr "Individuelle Gebäude aus einem langen Gebäude erstellen."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr "Einen geschlossenen Weg mit vier Knoten auswählen."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr "Abteilen"
@@ -17242,5 +17455,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr "Doppelte Knoten"
@@ -17250,5 +17463,5 @@
 msgstr "Dieser Test überprüft auf doppelte Knoten an der selben Stelle."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -17260,9 +17473,9 @@
 "diese verwenden.<br>Wollen Sie die Knoten wirklich löschen?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr "Bestätigung"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr "Knoten auf derselben Position"
@@ -17299,5 +17512,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -17454,7 +17667,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr "Ungültige Schlüssel/Wert-Kombinationen"
@@ -17462,80 +17675,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr "Zeichenproblem"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Schlüssel \"{0}\" ungültig."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr "Merkmale mit leerem Wert"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr "Ungültiger Schlüssel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr "Ungültiger Leerraum in Schlüssel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr "Werte beginnen oder enden mit Leerraum"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr "Werte enthalten HTML-Entität"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Schlüssel \"{0}\" nicht in Vorlagen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr "Vorlagen enthalten Schlüssel nicht"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Wert \"{0}\" für Schlüssel \"{1}\" nicht in Vorlagen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr "Vorlagen enthalten Wert nicht"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr "Korrekturnotizen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr "Schlüssel prüfen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Schlüssel durch Abgleich mit einer Liste auf Gültigkeit prüfen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr "Komplexen Eigenschaftsprüfer verwenden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr "Gültigkeit von Werten und Schlüsseln anhand komplexer Regeln prüfen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr "Datenquelle für Merkmalsprüfer"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -17545,33 +17758,33 @@
 "wiki.openstreetmap.org/index.php/User:JLS/speller) oder Merkmalsprüfung."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr "Eine neue Quelle zur Liste hinzufügen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr "Ausgewählte Quelle bearbeiten."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "Ausgewählte Quelle aus der Liste entfernen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "Datenquellen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr "Werte überprüfen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr "Prüft die Gültigkeit von Werten anhand von Objektvorlagen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr "Auf Korrekturnotizen prüfen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
@@ -17579,55 +17792,55 @@
 "(fixme) stehen haben."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr "Zeichennotizen prüfen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr "Prüfen, ob beim Kartenzeichnen Fehler aufgetreten sind."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr "Standarddatendatei verwenden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr "Nutzung der Standarddatendatei (empfohlen)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr "Standarddatei zum Merkmale ignorieren verwenden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 "Standarddatei zum Ignorieren von bekannten Merkmalen verwenden (empfohlen)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr "Standarddatei für Schreibprüfung verwenden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Standarddatei für die Schreibfehlerprüfung verwenden (empfohlen)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr "Eigenschaften korrigieren"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr "Konnte Elementtyp nicht finden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr "Konnte Warnlevel nicht finden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Ungültiger Ausdruck \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -17871,6 +18084,6 @@
 "Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)"
 msgstr ""
-"Geben Sie eine walking-papers.org URL oder ID (das Bit nach ?id= in der URL) "
-"an"
+"Geben Sie eine walking-papers.org URL oder ID (den Teil nach ?id= in der "
+"URL) an"
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:70
@@ -18103,5 +18316,5 @@
 msgstr "WMS-Ebene ({0}): Laden mit Zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -18116,13 +18329,17 @@
 "heruntergeladen werden?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr "Ja, Kacheln herunterladen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr "Ungültige URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+msgid "Download visible tiles"
+msgstr "Sichtbare Kacheln laden"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -18131,50 +18348,46 @@
 "die Auflösung"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
-msgid "Download visible tiles"
-msgstr "Sichtbare Kacheln laden"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "Auflösung ändern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr "Fehlerhafte Kacheln neu laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr "Alphakanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "WMS-Ebene in Datei speichern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr "WMS-Ebene speichern"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "WMS-Ebene aus Datei laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr "WMS-Ebene laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, 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:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr "Dateiformatfehler"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "Fehler beim Laden der Datei"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr "WMS-Lesezeichen erstellen"
@@ -18464,6 +18677,13 @@
 "Startet FireFox, um den gerade sichtbaren Bereich als SVG-Bild darzustellen."
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -18474,15 +18694,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Das großartige Plastic-Design von JGoodies."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr "Erlaubt anderen Programmen Kommandos an JOSM zu senden."
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -18493,10 +18713,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr "Bietet Routenführungsmöglichkeiten."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -18507,15 +18727,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Erlaubt Markierungen/Knoten an der aktuellen GPS Position einzufügen."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Öffnet einen Dialog, um Merkmale in einer Tabelle zu bearbeiten."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -18528,10 +18748,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr "Erstellt Reihenhäuser aus einem Häuserblock."
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -18543,5 +18763,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -18553,10 +18773,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Leichtes Herunterladen entlang einer langen Reihe verbundener Wege"
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -18665,6 +18885,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -18672,6 +18901,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "Referenz"
@@ -18688,5 +18918,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Spuren"
@@ -18708,10 +18938,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Höchstgeschwindigkeit (km/h)"
@@ -18755,14 +18985,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "Einbahnstraße"
@@ -18805,13 +19035,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -18849,13 +19079,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -18890,13 +19120,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "Senke"
@@ -18931,13 +19161,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "Straßendamm"
@@ -19069,4 +19299,13 @@
 msgid "Edit Unclassified Road"
 msgstr "Verbindungsstraße bearbeiten"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr "Ausweichstellen"
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -19084,15 +19323,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr "Breite (Meter)"
@@ -19104,5 +19343,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Ortsstraße"
@@ -19111,5 +19350,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "Ortsstraße bearbeiten"
@@ -19127,16 +19366,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Oberfläche"
@@ -19158,166 +19400,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr "befestigt"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr "unbefestigt"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr "asphaltiert"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr "Beton"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr "Metall"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "Holz"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr "Platte"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr "gepflastert"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "Schotter"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr "Kies"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr "verdichtet"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr "Rasengitterstein"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "Gras"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "Sand"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr "Erde"
@@ -19325,5 +19574,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr "Spielstraße"
@@ -19332,5 +19581,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr "Spielstraße bearbeiten"
@@ -19338,5 +19587,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "Fußgängerzone"
@@ -19345,5 +19594,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "Fußgängerzone bearbeiten"
@@ -19351,5 +19600,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr "Zufahrtsstraße"
@@ -19358,5 +19607,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr "Zufahrtsstraße bearbeiten"
@@ -19366,18 +19615,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr "Zufahrtsstraßentyp"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr "Gasse"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr "Auffahrt"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr "Parkplatzweg"
@@ -19385,5 +19634,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr "Parkplatzweg"
@@ -19393,5 +19642,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr "Parkplatzweg bearbeiten"
@@ -19399,5 +19648,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "Unbekannter Straßentyp"
@@ -19406,5 +19655,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "Straße mit unbekanntem Typ bearbeiten"
@@ -19413,20 +19662,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "Straßeneinschränkungen"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "Straßeneinschränkungen bearbeiten"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "Maut"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "Kein Ausgang (Sackgasse)"
@@ -19434,9 +19683,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 msgid "Access"
 msgstr "Zugang"
 
 #. 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"
@@ -19447,6 +19697,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -19458,4 +19706,5 @@
 #. 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"
@@ -19474,141 +19723,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+msgid "yes"
+msgstr "ja"
+
+#. 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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "Privat"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+msgstr "Nutzungsart beschildert"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:219
+msgid "destination"
+msgstr "Anlieger"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr "privat gestattet"
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr "Agrar & Forst"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-msgid "yes"
-msgstr "ja"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "Privat"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-msgstr "Nutzungsart beschildert"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "Anlieger"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr "privat gestattet"
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr "Agrar & Forst"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "nein"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr "Landwirtschaft"
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr "Waren"
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Schwerlast (hgv)"
@@ -19623,10 +19880,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr "Pferd"
@@ -19642,10 +19899,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "Motorrad"
@@ -19660,27 +19917,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr "Automobil"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr "Öffentlicher Service (psv)"
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr "Motorboot"
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "Boot"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Min. Geschwindigkeit (km/h)"
@@ -19688,25 +19937,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "Max. Gewicht (Tonnen)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr "Max. Höhe (Meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr "Max. Breite (Meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr "Max. Länge (Meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "Kreisverkehr"
@@ -19717,5 +19966,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "Kreuzung bearbeiten"
@@ -19735,10 +19984,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "Autobahn"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr "Autobahnanschluß"
@@ -19760,10 +20009,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "Schnellstraße"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr "Schnellstraßenanschluß"
@@ -19785,10 +20034,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "Bundesstraße"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr "Bundesstraßenanschluß"
@@ -19810,5 +20059,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -19823,9 +20072,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "Kreisstraße"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr "Verbindungsstraße"
@@ -19839,9 +20088,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "Ortsstraße"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr "Spielstraße"
@@ -19871,10 +20120,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "Service"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr "Spurbus"
@@ -19904,5 +20153,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -19914,10 +20163,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Brücke bearbeiten"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr "Tunnel bearbeiten"
@@ -19925,19 +20174,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Wege"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "Baustelle"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "Eine im Bau befindliche Straße bearbeiten"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "Kreuzung"
@@ -19953,5 +20202,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "Kreisverkehr"
@@ -19959,5 +20208,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr "Feld- oder Waldweg"
@@ -19966,34 +20215,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr "Feld- oder Waldweg bearbeiten"
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "Tracktype"
 msgstr "Typ des Weges"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade1"
 msgstr "Grad 1"
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade2"
 msgstr "Grad 2"
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade3"
 msgstr "Grad 3"
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade4"
 msgstr "Grad 4"
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade5"
 msgstr "Grad 5"
 
-#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr "MTB-Skala"
@@ -20001,5 +20250,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr "SAC-Skala"
@@ -20007,26 +20256,26 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr "Wandern"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
 msgstr "Bergwanderweg"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
 msgstr "Anspruchsvoller Bergwanderweg"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
 msgstr "Alpiner Wanderweg"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
 msgstr "Anspruchsvoller alpiner Wanderweg"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
 msgstr "Schwerer alpiner Wanderweg"
@@ -20034,5 +20283,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "Pfad"
@@ -20041,7 +20290,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "Pfad bearbeiten"
+
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr "exzellent"
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr "gut"
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr "mittelschwer"
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr "schlecht"
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr "sehr schlecht"
 
 #: build/trans_presets.java:489
@@ -20112,5 +20382,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr "dedizierter Fußweg"
@@ -20119,10 +20389,9 @@
 #. <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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Fußweg bearbeiten"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr "Fahrräder"
@@ -20130,5 +20399,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "Treppe"
@@ -20138,5 +20407,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Treppe bearbeiten"
@@ -20144,10 +20413,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr "Wegpunkte"
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "Anschlussstelle"
@@ -20155,15 +20424,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "Anschlussstelle bearbeiten"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "Rastplatz / Autohof"
@@ -20171,5 +20440,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr "Rastplatz / Autohof bearbeiten"
@@ -20177,5 +20446,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -20208,17 +20478,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "Betreiber"
@@ -20227,5 +20497,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "Ampel"
@@ -20235,5 +20505,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr "Typ des Fußgängerüberwegs"
@@ -20242,27 +20512,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr "unkontrolliert"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr "Ampel"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "Insel"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr "unmarkiert"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr "Zu Pferd"
@@ -20270,6 +20540,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr "Mit Fahrrad"
@@ -20278,11 +20548,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr "Schülerlotse"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr "Übergangstyp (UK)"
@@ -20290,30 +20560,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr "Zebrastreifen"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr "Ampel (Pelikan)"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr "Fußgängerampel (Toukan)"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr "Fußgängerampel (Puffin)"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr "Ampel für Füßgänger, Fahrrad, Pferd (Pegasus)"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr "Zebrastreifen (Tiger)"
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "Stopp-Schild"
@@ -20321,5 +20591,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr "Fußgängerüberweg"
@@ -20328,14 +20598,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr "Fußgängerüberweg bearbeiten"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr "Typname (UK)"
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr "Verkehrsberuhigung"
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr "Verkehrsberuhigung bearbeiten"
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr "Bodenschwelle"
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr "Schikane"
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr "Fahrbahnverengung"
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr "Bodenwelle (mit Lücken)"
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr "Bodenwelle (lang)"
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr "Bodenwelle (sehr lang und flach)"
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr "Ausweichstelle"
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr "Ausweichstelle bearbeiten"
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr "Kleiner Kreisverkehr"
@@ -20346,14 +20662,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr "Richtung"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr "Im Uhrzeigersinn"
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr "Wendestelle"
@@ -20363,26 +20679,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "Ortseingangsschild"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "Ortseingangsschild bearbeiten"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr "Zweiter Name"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 msgid "Speed Camera"
 msgstr "Geschwindigkeitsüberwachung"
 
 #. 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "Notfalltelefon"
@@ -20390,5 +20708,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr "Steigung"
@@ -20396,5 +20714,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr "Starke Steigung"
@@ -20402,11 +20720,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+msgid "Grit Bin"
+msgstr "Splittbehälter"
+
+#. 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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr "Furt"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr "Furt bearbeiten"
@@ -20414,5 +20739,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr "Gebirgspass"
@@ -20420,5 +20745,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr "Gebirgspass bearbeiten"
@@ -20430,7 +20755,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "Höhe"
@@ -20438,5 +20763,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Barrieren"
@@ -20444,5 +20769,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr "Poller"
@@ -20450,5 +20775,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr "Poller bearbeiten"
@@ -20493,16 +20818,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "Erlaubter Verkehr:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr "Umlaufgitter"
@@ -20511,5 +20836,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr "Steinblock"
@@ -20517,5 +20842,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr "Viehgitter"
@@ -20523,10 +20848,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr "Viehgitter bearbeiten"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr "Busschleuse"
@@ -20534,15 +20859,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr "Spikes / Dornen"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr "Spikes / Dornen bearbeiten"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "Mautstation"
@@ -20550,5 +20875,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "Mautstation bearbeiten"
@@ -20556,10 +20881,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr "Grenzkontolle"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr "Grenzkontrolle bearbeiten"
@@ -20569,5 +20894,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr "Hecke"
@@ -20576,12 +20901,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:817 build/trans_presets.java:819
 msgid "Fence"
 msgstr "Zaun"
 
-#. item "Barriers/Fence"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr "Zaun"
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr "Holzzaun"
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr "Holzzaun"
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "Mauer"
@@ -20589,5 +20926,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "Stadtmauer"
@@ -20596,5 +20933,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr "Stützmauer"
@@ -20606,15 +20943,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr "Eingang"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr "Eingang bearbeiten"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "Gatter / Tor"
@@ -20622,50 +20960,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr "Gatter / Tor bearbeiten"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr "Schlagbaum"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr "Schlagbaum bearbeiten"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr "Drahtgatter"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr "Drahtgatter bearbeiten"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr "Fahrzeuggatter"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr "Fahrzeuggatter bearbeiten"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr "Personengatter"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr "Personengatter bearbeiten"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr "Zauntreppe"
@@ -20673,25 +21011,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr "Zauntreppe bearbeiten"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr "Drehsperre"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr "Drehsperre bearbeiten"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr "Durchgangsschleuse"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr "Durchgangsschleuse bearbeiten"
@@ -20702,11 +21040,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "Wasser"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "Quelle"
@@ -20714,5 +21052,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "Quelle bearbeiten"
@@ -20720,5 +21058,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr "Abwassergraben"
@@ -20726,10 +21064,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr "Abwassergraben bearbeiten"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr "Wassergraben"
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr "Wassergraben bearbeiten"
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "Bach"
@@ -20737,10 +21086,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "Bach bearbeiten"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "Kanal"
@@ -20748,10 +21097,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "Kanal bearbeiten"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "Fluß"
@@ -20761,5 +21110,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "Fluss bearbeiten"
@@ -20767,15 +21116,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Wasserfläche bearbeiten"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "Landfläche bearbeiten"
@@ -20783,15 +21132,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr "Wasserbecken"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr "Wasserbecken bearbeiten"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr "Speicherbecken"
@@ -20799,15 +21148,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr "Speicherbecken bearbeiten"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr "Überdecktes Speicherbassin"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr "Überdecktes Speicherbassin bearbeiten"
@@ -20815,5 +21164,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "Flußbett"
@@ -20822,10 +21171,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "Flußbett bearbeiten"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr "Feuchtgebiet"
@@ -20836,14 +21185,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr "Feuchtgebiet bearbeiten"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "Sumpf"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr "Moor"
@@ -20857,35 +21206,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr "Marsch"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr "Röhricht"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr "Salzwiese"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr "Watt"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr "Mangroven"
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "Schlick & Moor"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr "Schlickiges Gebiet bearbeiten"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "Strand"
@@ -20893,20 +21242,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "Strand bearbeiten"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "Meeresbucht"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "Meeresbucht bearbeiten"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "Klippe"
@@ -20914,10 +21263,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "Klippe bearbeiten"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "Küstenlinie"
@@ -20925,5 +21274,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "Küstenlinie bearbeiten"
@@ -20931,5 +21280,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "Fährroute"
@@ -20937,5 +21286,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr "Fährroute bearbeiten"
@@ -20944,5 +21293,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr "Bootswerft"
@@ -20950,10 +21299,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr "Bootswerft bearbeiten"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "Dock"
@@ -20961,5 +21310,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr "Dock bearbeiten"
@@ -20967,5 +21316,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "Damm"
@@ -20973,15 +21322,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "Damm bearbeiten"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr "Gewässerpunkte"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr "Schleusentor"
@@ -20990,5 +21339,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr "Wehr"
@@ -20996,20 +21345,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr "Wehr bearbeiten"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "Wasserfall"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "Wasserfall bearbeiten"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr "Wendepunkt"
@@ -21018,15 +21367,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr "Jachthafen"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr "Jachthafen bearbeiten"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "Anlegestelle (Pier)"
@@ -21034,10 +21383,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "Anlegestelle (Pier) bearbeiten"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr "Fährstelle"
@@ -21045,10 +21394,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr "Fährstelle bearbeiten"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr "Bootshebeanlage"
@@ -21058,20 +21407,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr "Bootshebeanlage bearbeiten"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr "Transport"
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "Eisenbahn"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "Eisenbahn"
@@ -21079,5 +21428,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr "Eisenbahn bearbeiten"
@@ -21086,139 +21435,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr "Spurweite (mm)"
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr "Standard"
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+msgid "Types"
+msgstr "Arten"
+
+#. 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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr "Rangiergleis"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr "Abstellgleis"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr "Firmenanschlußgleis"
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+msgid "Electrified"
+msgstr "Elektrifiziert"
+
+#. 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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+msgid "contact_line"
+msgstr "Oberleitung"
+
+#. 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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr "Eisenbahn"
+
+#. 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:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+msgid "Voltage"
+msgstr "Spannung"
+
+#. 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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr "Frequenz (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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr "16,7"
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr "Schmalspurbahn"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr "Schmalspurbahn bearbeiten"
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr "Einschienenbahn"
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr "Einschienenbahn bearbeiten"
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr "Museumsbahn"
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr "Museumsbahn bearbeiten"
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr "Stadtbahn"
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr "Stadtbahn bearbeiten"
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "U-Bahn"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "U-Bahn bearbeiten"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "Straßenbahn"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr "Straßenbahn bearbeiten"
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr "Spurbus"
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr "Spurbusstrecke bearbeiten"
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "Stillgelegte Strecke"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "Stillgelegte Strecke bearbeiten"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr "Optionale Typen"
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr "Rangiergleis"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr "Abstellgleis"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr "Firmenanschlußgleis"
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr "Schmalspurbahn"
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr "Schmalspurbahn bearbeiten"
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr "Einschienenbahn"
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr "Einschienenbahn bearbeiten"
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr "Museumsbahn"
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr "Museumsbahn bearbeiten"
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr "S-Bahn"
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr "S-Bahn bearbeiten"
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "U-Bahn"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "U-Bahn bearbeiten"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "Straßenbahn"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr "Straßenbahn bearbeiten"
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr "Spurbus"
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr "Spurbusstrecke bearbeiten"
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "Stillgelegte Strecke"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "Stillgelegte Strecke bearbeiten"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "Strecke abgebaut"
@@ -21227,5 +21815,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr "Bahnübergang"
@@ -21234,5 +21822,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr "(Fuß-)Übergang"
@@ -21242,5 +21830,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr "Type des Übergangs"
@@ -21248,5 +21836,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "Drehscheibe"
@@ -21255,10 +21843,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+msgid "Buffer Stop"
+msgstr "Prellbock"
+
+#. 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:1289
 msgid "Aerialway"
 msgstr "Seilbahnen"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "Sessellift"
@@ -21266,10 +21861,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr "Sessellift bearbeiten"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr "Schlepplift"
@@ -21277,10 +21872,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr "Schlepplift bearbeiten"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "Seilbahn"
@@ -21288,10 +21883,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "Seilbahn bearbeiten"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr "Gondelbahn"
@@ -21299,10 +21894,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr "Gondelbahn bearbeiten"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -21310,12 +21905,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr "Station bearbeiten"
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr "Pfeiler"
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr "Pfeiler bearbeiten"
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "Tankstelle"
@@ -21325,9 +21933,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Tankstelle bearbeiten"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr "Agip"
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr "Aral"
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr "Avia"
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr "BP"
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr "Esso"
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr "OMV"
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr "Q8"
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr "Repsol"
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr "Shell"
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr "Statoil"
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr "Tamoil"
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr "Texaco"
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr "Total"
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr "Freie Tankstelle"
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -21381,32 +22046,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "Öffnungszeiten"
@@ -21465,94 +22130,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mo-Fr 08:30-20:00"
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr "Kraftstoffsorten:"
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr "Diesel"
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr "Bio Diesel"
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr "Diesel (teilweise synthetisch, V-Power etc.)"
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr "Diesel für LKW"
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr "Normalbenzin"
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr "Super"
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr "Super plus"
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr "100 Oktan"
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr "E10 (10% Ethanol Gemisch)"
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr "E85 (85% Ethanol Gemisch)"
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr "LPG (Flüssiggas)"
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr "CNG (komprimiertes Erdgas)"
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr "1:25 Gemisch (Mofa/Moped)"
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr "1:50 Gemisch (Mofa/Moped)"
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -21564,5 +22305,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -21572,5 +22313,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Parken bearbeiten"
@@ -21581,25 +22322,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr "Referenznummer"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "Parkhaus"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "ebenerdig"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr "Tiefgarage"
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr "Park and Ride"
@@ -21608,48 +22349,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "Gebühr"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr "Gesamtkapazität"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr "Behindertenparkplätze"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr "Stellplätze für Frauen"
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr "Stellplätze für Eltern"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Siehe Wiki für weitere Werte capacity:[types]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "Autowäsche"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "Autowäsche bearbeiten"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "Werkstatt"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "Autowerkstatt bearbeiten"
@@ -21657,5 +22398,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "Vermietung"
@@ -21664,10 +22405,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "Autovermietung bearbeiten"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr "Autotausch / Car Sharing"
@@ -21675,5 +22416,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr "Autotausch (Car Sharing) bearbeiten"
@@ -21681,10 +22422,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "Fahrradparkplatz bearbeiten"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr "Kapazität"
@@ -21693,15 +22434,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "Fahrradleihstelle bearbeiten"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Öffentliche Verkehrsmittel"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -21711,5 +22452,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -21717,5 +22458,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr "UIC-Referenz"
@@ -21723,5 +22464,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr "Eisenbahnhaltepunkt"
@@ -21729,5 +22470,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr "Haltepunkt bearbeiten"
@@ -21735,5 +22476,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "Straßenbahnhaltestelle"
@@ -21742,5 +22483,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "Straßenbahnhaltestelle bearbeiten"
@@ -21748,5 +22489,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "Bahnsteig"
@@ -21755,5 +22496,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "Bahnsteig bearbeiten"
@@ -21765,5 +22506,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr "Referenznummer (Steig)"
@@ -21771,10 +22512,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr "Fläche"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "U-Bahn-Eingang"
@@ -21783,10 +22524,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "U-Bahn-Eingang bearbeiten"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr "Rollstuhl"
@@ -21795,5 +22536,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "Busbahnhof"
@@ -21802,5 +22543,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "Busbahnhof bearbeiten"
@@ -21808,5 +22549,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "Bushaltestelle"
@@ -21816,5 +22557,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "Bushaltestelle bearbeiten"
@@ -21823,25 +22564,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr "Schutzraum"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "Bank"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr "Blindenleitbelag"
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr "Bussteig"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr "Bussteig bearbeiten"
@@ -21849,5 +22591,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "Taxi"
@@ -21855,5 +22597,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "Taxihaltepunkt bearbeiten"
@@ -21861,32 +22603,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "Flughafen"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr "Flugplatz"
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr "Flughafen bearbeiten"
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr "Flugplatz bearbeiten"
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr "IATA"
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr "ICAO"
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr "Start-/Landebahn"
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr "Start-/Landebahn bearbeiten"
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr "Rollbahn"
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr "Rollbahn bearbeiten"
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr "Hubschrauberlandeplatz"
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+msgid "Edit Helipad"
+msgstr "Hubschrauberlandeplatz bearbeiten"
+
+#. item "Airport/Helipad" text "Reference"
+#. </optional>
+#. item "Airport/Apron"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
+msgid "Apron"
+msgstr "Vorfeld"
+
+#. 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:1553 build/trans_presets.java:1555
+msgid "Hangar"
+msgstr "Hangar"
+
+#. 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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+msgid "Beacon"
+msgstr "Bake"
+
+#. 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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr "Windsack"
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr "Terminal"
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr "Terminal bearbeiten"
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr "Terminal-Gate bearbeiten"
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr "Reisen"
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Unterkunft"
@@ -21898,5 +22735,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -21905,15 +22742,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "Hotel bearbeiten"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "Sterne"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr "Motel"
@@ -21921,20 +22758,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr "Motel bearbeiten"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr "Gästehaus (Bed & Breakfast)"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr "Gästehaus bearbeiten"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "Ferienhaus"
@@ -21942,10 +22779,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr "Ferienhaus bearbeiten"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr "Jugendherberge"
@@ -21953,30 +22790,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr "Jugendherberge bearbeiten"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr "Alpenhütte"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr "Alpenhütte bearbeiten"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr "Wohnwagenstellplätze"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr "Wohnwagenstellplätze bearbeiten"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "Campingplatz"
@@ -21984,10 +22821,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr "Campingplatz bearbeiten"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Essen & Trinken"
@@ -21998,5 +22835,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -22004,5 +22841,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "Restaurant bearbeiten"
@@ -22010,5 +22847,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr "Küche"
@@ -22016,61 +22853,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "italienisch"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "chinesisch"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "Pizza"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "Hamburger"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "griechisch"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "deutsch"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "indisch"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr "Döner"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "türkisch"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "asiatisch"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "thailändisch"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "mexikanisch"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "japanisch"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr "französisch"
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr "Sandwich"
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr "Sushi"
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "Imbiss (Fast Food)"
@@ -22078,9 +22927,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "Imbiss (Fast Food-Restaurant) bearbeiten"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr "Fish and Chips"
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr "Hähnchen"
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "Café"
@@ -22088,9 +22945,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "Café bearbeiten"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "Kneipe"
@@ -22098,18 +22955,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "Kneipe bearbeiten"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr "Biergarten bearbeiten"
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr "Bar"
@@ -22117,9 +22974,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr "Bar bearbeiten"
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "Nachtclub"
@@ -22127,24 +22984,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "Nachtclub bearbeiten"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Tourismus"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr "Attraktion"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr "Attraktion bearbeiten"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Museum"
@@ -22152,9 +23009,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Museum bearbeiten"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Zoo"
@@ -22163,9 +23020,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Zoo bearbeiten"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "Aussichtspunkt"
@@ -22173,24 +23030,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "Aussichtspunkt bearbeiten"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr "Aussichtsturm"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "Themenpark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr "Themenpark bearbeiten"
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "Kunstausstellung"
@@ -22198,5 +23055,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "Kunstausstellung bearbeiten"
@@ -22204,19 +23061,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr "Informationsbüro"
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Karte"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr "Detailgrad"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr "topograhisch"
@@ -22254,5 +23111,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -22260,28 +23117,28 @@
 msgstr "Straße"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr "schematisch"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr "Kartenausschnitt"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr "Örtlichkeit"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr "Stadt"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr "Region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr "Nähere Beschreibung"
@@ -22291,5 +23148,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr "Dargestellte Routen für:"
@@ -22297,5 +23154,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr "Wanderweg"
@@ -22303,6 +23160,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "Radfahren"
@@ -22310,5 +23167,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr "Mountainbike fahren"
@@ -22316,6 +23173,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "Skifahren"
@@ -22323,5 +23180,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr "Reiten"
@@ -22329,46 +23186,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr "...andere mögliche Transportarten"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr "Informationstafel"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr "Inhalt"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr "Notiz"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "Geschichte"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr "Natur"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr "Wildtiere"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr "Pflanzen"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr "Wegweiser"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr "Informationsterminal"
@@ -22376,29 +23233,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr "Nähere Beschreibung"
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr "Audioguide"
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr "Audioguide per Handy?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr "Telefonnummer"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr "Andere Informationspunkte"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr "Schutzraum bearbeiten"
@@ -22406,25 +23263,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr "Feuerstelle"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "Picknickplatz"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "Picknickplatz bearbeiten"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Historische Stätten"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Burg / Schloß"
@@ -22433,19 +23290,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Burg / Schloß bearbeiten"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Ruinen"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Ruinen bearbeiten"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Ausgrabungsstelle"
@@ -22454,9 +23311,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "Ausgrabungsstelle bearbeiten"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "Schlachtfeld"
@@ -22464,10 +23321,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "Schlachtfeld bearbeiten"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr "Paläontologische Stätte"
@@ -22475,5 +23332,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr "Paläontologische Stätte bearbeiten"
@@ -22481,15 +23338,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "Baudenkmal"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "Baudenkmal bearbeiten"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "Gedenkstätte"
@@ -22497,55 +23354,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "Gedenkstätte bearbeiten"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr "Wegkreuz"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr "Wegkreuz bearbeiten"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr "Bildstock"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr "Bildstock bearbeiten"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr "Grenzstein"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr "Grenzstein bearbeiten"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Freizeit"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "Schwimmbad"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "Schwimmbad bearbeiten"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Spielplatz"
@@ -22553,35 +23410,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Spielplatz bearbeiten"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Angeln"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "Angelplatz bearbeiten"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr "Sporteinrichtungen"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Stadion bearbeiten"
@@ -22595,6 +23452,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "Sportart wählen:"
@@ -22986,6 +23843,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -23019,225 +23876,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr "Mehrfachnutzung"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "Bogenschießen"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr "Leichtathletik"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "Australian Football"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "Baseball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "Basketball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr "Boule"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr "Bowls"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr "Kanu"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "Klettern"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr "Kricket"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr "Kricketnetze"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr "Krocket"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "Fahrradfahren"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr "Hunderennen"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr "Reiten"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "American Football"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "Golf"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "Gymnastik"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "Hockey"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr "Pferderennen"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr "Motorsport"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr "Pelota"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr "Schlagball (Racquet)"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr "Rugby"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "Schießen"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr "Skateboard"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr "Eislaufen"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "Skifahren"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "Fußball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "Schwimmen"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "Tischtennis"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "Tennis"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "Sporthalle / Fitnesscenter"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "Sporthalle / Fitnesscenter bearbeiten"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr "Spielfeld"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr "Spielfeld bearbeiten"
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr "Rennbahn"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr "Rennbahn bearbeiten"
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "Golfanlage"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "Golfanlage bearbeiten"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "Minigolfplatz bearbeiten"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr "Mehrfachnutzung"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr "Mehrfach genutzten Sportplatz bearbeiten"
@@ -23276,21 +24133,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "Typ"
@@ -23329,203 +24186,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr "Spielfeld"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "Sporthalle / Fitnesscenter"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "Stadion"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr "Weg"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr "Bowlinghalle bearbeiten"
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr "Leichtathletik"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr "Leichtathletikfeld bearbeiten"
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "Bogenschießen"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "Bogenschießplatz bearbeiten"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "Klettern"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "Kletterbereich bearbeiten"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr "Kanufahren"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr "Kanufahrtstrecke bearbeiten"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr "Radsporthalle oder -kurs bearbeiten"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "Hunderennen"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr "Trainingsplatz für Hunde bearbeiten"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr "Reitplatz"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr "Reitplatz bearbeiten"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr "Pferderennen"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr "Pferderennplatz bearbeiten"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr "Gymnastikbereich bearbeiten"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr "Motorsportplatz bearbeiten"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr "Eislaufen"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr "Eislaufbahn bearbeiten"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr "Skateboardplatz bearbeiten"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "Schwimmen"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "Schwimmbad bearbeiten"
@@ -23533,56 +24390,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr "Skipiste bearbeiten"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr "Pistentyp"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr "Abfahrt"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr "Langlauf"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr "Schneepark"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr "Schwierigkeit"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr "Anfänger"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr "einfach"
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr "mittelschwer"
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr "fortgeschritten"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr "Experte"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr "Freistil"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "Schießen"
@@ -23590,182 +24443,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "Schießbahn bearbeiten"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "Fußball"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr "Fußballplatz bearbeiten"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "American Football"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr "American Football-Platz bearbeiten"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr "Australian Foootball-Platz bearbeiten"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr "Baseballplatz bearbeiten"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "Basketballplatz bearbeiten"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "Golfplatz"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr "Golfplatz bearbeiten"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "Golfanlage"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr "Boule-Spielbereich bearbeiten"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr "Bowls-Spielfeld bearbeiten"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr "Kricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr "Kricketspielfeld bearbeiten"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr "Kricketnetze"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr "Kricketnetze bearbeiten"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr "Krocketspielfeld bearbeiten"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "Hockeyplatz bearbeiten"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr "Pelotaplatz bearbeiten"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr "Schlagball (Racquet)"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr "Schlagball (Racquet)-Platz bearbeiten"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr "Rugbyplatz bearbeiten"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "Tischtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "Tischtennisplatz bearbeiten"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "Tennisplatz bearbeiten"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr "Zivilisationsbauten"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Gebäude"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "Gebäude"
@@ -23773,5 +24626,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Öffentliches Gebäude"
@@ -23779,10 +24632,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Öffentliches Gebäuden bearbeiten"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "Rathaus"
@@ -23790,10 +24643,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Rathaus bearbeiten"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Botschaft"
@@ -23801,10 +24654,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Botschaft bearbeiten"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "Gericht"
@@ -23813,10 +24666,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Gericht bearbeiten"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Gefängnis"
@@ -23825,10 +24678,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Gefängnis bearbeiten"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Polizei"
@@ -23838,10 +24691,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Polizei bearbeiten"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "Feuerwache"
@@ -23850,10 +24703,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Feuerwache bearbeiten"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Post"
@@ -23861,5 +24714,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Post bearbeiten"
@@ -23867,15 +24720,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "Kindergarten"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "Kindergarten bearbeiten"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "Schule"
@@ -23883,10 +24736,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "Schule bearbeiten"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "Universität"
@@ -23894,10 +24747,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "Universität bearbeiten"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "Hochschule"
@@ -23905,5 +24758,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "College bearbeiten"
@@ -23911,5 +24764,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Kino"
@@ -23918,10 +24771,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Kino bearbeiten"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "Bibliothek"
@@ -23930,9 +24783,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Bibliothek bearbeiten"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "Kulturzentrum"
@@ -23940,10 +24793,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "Kulturzentrum bearbeiten"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Theater"
@@ -23952,10 +24805,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Theater bearbeiten"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "Kirche"
@@ -23965,5 +24818,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "Kirche bearbeiten"
@@ -23972,6 +24825,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "Religion"
@@ -23980,66 +24833,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr "bahaiistisch"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "buddhistisch"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "christlich"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "hinduistisch"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr "jainistisch"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "jüdisch"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "moslemisch"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr "sikhistisch"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr "spiritistisch"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr "taoistisch"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr "unitarisch"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr "zoroastrisch"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr "Konfession"
@@ -24048,81 +24901,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr "anglikanisch"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "baptistisch"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "katholisch"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr "evangelikal"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr "Zeugen Jehovas"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "lutherisch"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr "methodistisch"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr "mormonisch"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr "Pfingstgemeinde"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr "presbyterianisch"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "protestantisch"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr "Quäker"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr "schiitisch"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr "sunnitisch"
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Adressen"
@@ -24131,5 +24984,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Adressinformationen bearbeiten"
@@ -24137,5 +24990,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "Hausnummer"
@@ -24143,25 +24996,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "Hausname"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Straßenname"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "Ortsname"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Postleitzahl"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "Länderkennung"
@@ -24170,5 +25023,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "Adressinterpolation bearbeiten"
@@ -24176,61 +25029,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr "Nummernschema"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "ungerade"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "gerade"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr "alphabetisch"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr "Zivilisationsbauten"
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "Fabrik"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "Fabrik bearbeiten"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Turm"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Turm bearbeiten"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr "Art des Turms"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr "Kommunikation"
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr "Beobachtung"
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr "Höhe (in Meter)"
@@ -24238,25 +25091,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Wasserturm"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Wasserturm bearbeiten"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "Gasometer bearbeiten"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "Leuchtturm"
@@ -24264,10 +25117,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Leuchtturm bearbeiten"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Windmühle"
@@ -24275,10 +25128,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Windmühle bearbeiten"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -24287,37 +25140,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Pipeline bearbeiten"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
+msgid "gas"
+msgstr "Gas"
+
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr "Wärme"
+
+#: build/trans_presets.java:2353
 msgid "oil"
 msgstr "Öl"
 
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-msgid "gas"
-msgstr "Gas"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr "Abwasser"
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr "Wärme"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr "Beliebige Substanz"
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr "Unter Wasser"
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr "oberirdisch"
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "Kläranlage"
@@ -24327,10 +25180,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "Kläranlage bearbeiten"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Stationärer Kran"
@@ -24338,21 +25191,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Stationären Kran bearbeiten"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr "Bake"
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr "Bake bearbeiten"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "Vermessungspunkt"
@@ -24360,10 +25208,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "Vermessungspunkt bearbeiten"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "Überwachungskamera"
@@ -24371,11 +25219,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Überwachungskamera bearbeiten"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr "im Gebäude"
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr "im Freien"
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr "öffentlich"
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "Stromgenerator"
@@ -24385,35 +25245,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "Stromgenerator bearbeiten"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "Wind"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "Wasser"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "Fossil"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "Nuklear"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "Kohle"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr "Photovoltaik"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "Umspannwerk"
@@ -24422,10 +25282,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "Umspannwerk bearbeiten"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "Trafostation"
@@ -24434,5 +25294,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "Trafostation bearbeiten"
@@ -24440,10 +25300,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr "Liniennummer"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "Strommast"
@@ -24454,23 +25314,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "Strommast bearbeiten"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr "Turm"
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr "Mast"
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr "Identifikation des Turms"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "Stromleitung"
@@ -24479,79 +25339,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "Stromleitung bearbeiten"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr "Art der Stromleitung"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr "Freileitung (Starkstrom)"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr "Freitleitung (Schwachstrom)"
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "Spannung"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr "Anzahl Leitungen"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr "einzeln"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr "doppelt"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr "dreifach"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr "vierfach"
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr "Einrichtungen"
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Toiletten"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr "limitiert"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr "Kommentar"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "Briefkasten"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Telefon"
@@ -24560,5 +25415,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Telefon bearbeiten"
@@ -24566,5 +25421,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Münzen"
@@ -24572,5 +25427,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "Scheine"
@@ -24578,5 +25433,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr "Geld- oder Prepaidkarten"
@@ -24584,5 +25439,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr "Konto- oder EC-Karten"
@@ -24590,15 +25445,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Kreditkarten"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Telefonkarten"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Recyclingstelle & -container"
@@ -24607,5 +25462,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Recyclingstelle oder -container bearbeiten"
@@ -24613,63 +25468,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "Batterien"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "Dosen"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "Kleidung"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "Altmetall"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr "Abfalleimer"
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+msgid "Edit Waste Basket"
+msgstr "Abfalleimer bearbeiten"
 
 #. item "Amenities/Bench"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr "Lehne"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr "Stein"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr "Kunststoff"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr "Farbe"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr "schwarz"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr "braun"
@@ -24748,5 +25614,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -24756,31 +25622,31 @@
 msgstr "grün"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr "rot"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr "blau"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr "grau"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr "weiß"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr "Anzahl der Sitzplätze"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr "Jagdanstand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr "Jagdanstand bearbeiten"
@@ -24789,30 +25655,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "Höhe"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr "niedrig"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr "halb"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr "voll"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr "Versteck"
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr "Schloß"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "Springbrunnen"
@@ -24821,10 +25687,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "Springbrunnen bearbeiten"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "Trinkwasser"
@@ -24833,10 +25699,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Trinkwasserabgabe bearbeiten"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+msgid "Fire Hydrant"
+msgstr "Hydrant"
+
+#. 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:2517
+msgid "Edit Fire Hydrant"
+msgstr "Hydrant bearbeiten"
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr "Babyklappe"
@@ -24844,15 +25723,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr "Babyklappe bearbeiten"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Geschäfte"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr "Autohändler"
@@ -24860,10 +25739,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "Autohaus bearbeiten"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr "Fahrradladen"
@@ -24872,28 +25751,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "Fahrradladen bearbeiten"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "Supermarkt bearbeiten"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr "Drogerie"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr "Drogerie bearbeiten"
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr "Tante-Emma-Laden"
@@ -24901,9 +25780,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr "Tante-Emma-Laden bearbeiten"
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -24911,27 +25790,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "Kiosk bearbeiten"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr "Buchhandlung"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr "Buchhandlung bearbeiten"
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr "Reisebüro"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr "Reisebüro bearbeiten"
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "Verkaufsautomat"
@@ -24939,5 +25818,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "Automaten bearbeiten"
@@ -24945,88 +25824,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "Automatenprodukte"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr "Fahrscheine"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr "Pläne des öffentlichen Nahverkehrs"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr "Parkscheine"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "Essen"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "Getränke"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "Süßigkeiten"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "Zigaretten"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "Fotos"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "Tiernahrung"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "Zeitungen"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "Spielzeug"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "Briefmarken"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "SIM-Karten"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr "Telefonkarten"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr "Karten/Belege"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "Kondome"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr "Tampons"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr "Hundekot-Tüten"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr "Kundenkarten"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "Fleischer"
@@ -25034,9 +25913,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Fleischer bearbeiten"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "Bäcker"
@@ -25044,9 +25923,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Bäcker bearbeiten"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "Blumenladen"
@@ -25054,18 +25933,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "Blumenladen bearbeiten"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr "Bioladen"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr "Bioladen bearbeiten"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr "Spirituosen"
@@ -25073,54 +25952,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr "Spirituosengeschäft bearbeiten"
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr "Getränke"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr "Getränkeladen bearbeiten"
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "Computergeschäft bearbeiten"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr "Elektronikgeschäft"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "Elektronikgeschäft bearbeiten"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr "Hifi-Geschäft bearbeiten"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr "Mobiliar"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "Möbelgeschäft bearbeiten"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr "Gartenzentrum"
@@ -25128,9 +26007,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr "Gartenzentrum bearbeiten"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr "Haushaltswaren"
@@ -25138,9 +26017,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr "Haushaltswaren bearbeiten"
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "Heimwerkerbedarf"
@@ -25148,54 +26027,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "Geschäft für Heimwerkerbedarf bearbeiten"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr "Bürobedarf"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr "Bürobedarf bearbeiten"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "Friseur"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "Friseur bearbeiten"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr "Schuhe"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "Schuhladen bearbeiten"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr "Spielzeug"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "Spielzeuggeschäft bearbeiten"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr "Videoverleih"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr "Videogeschäft bearbeiten"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Chemische Reinigung"
@@ -25203,9 +26082,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Chemische Reinigung bearbeiten"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Waschsalon"
@@ -25213,9 +26092,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Waschsalon bearbeiten"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr "Camping (Outdoor)"
@@ -25223,28 +26102,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr "Laden für Camping- (Outdoor-)bedarf bearbeiten"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr "Sportgeschäft bearbeiten"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr "Optiker"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "Optiker bearbeiten"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Geld"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Bank"
@@ -25252,14 +26131,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Bank bearbeiten"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "Geldautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Wechselstube"
@@ -25267,5 +26146,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Wechselstube bearbeiten"
@@ -25273,15 +26152,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Geldautomat bearbeiten"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Gesundheit"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "Arzt"
@@ -25289,18 +26168,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "Arzt bearbeiten"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "Zahnarzt"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "Zahnarzt bearbeiten"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Apotheke"
@@ -25308,5 +26187,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Apotheke bearbeiten"
@@ -25314,9 +26193,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr "Rezepteinlösung"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Krankenhaus"
@@ -25324,10 +26203,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Krankenhaus bearbeiten"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr "Notfallrettungspunkt"
@@ -25336,5 +26215,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr "Notfallrettungspunkt bearbeiten"
@@ -25343,20 +26222,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr "Punktname"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Internationale Nummer verwenden, z.B. +49-123-45678)"
@@ -25364,5 +26243,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "Tierarzt"
@@ -25371,64 +26250,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "Tierarzt bearbeiten"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr "Geografie"
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Orte"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Kontinent bearbeiten"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "Staat"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Staat bearbeiten"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "Bundesland"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "Bundesland bearbeiten"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "Region bearbeiten"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr "Landkreis"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr "Landkreis bearbeiten"
@@ -25436,15 +26315,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "Großstadt"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "Großstadt bearbeiten"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "Stadt"
@@ -25452,10 +26331,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "Stadt bearbeiten"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "Stadtteil"
@@ -25463,25 +26342,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "Stadtteil bearbeiten"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Dorf"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Dorf bearbeiten"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "Weiler"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "Weiler bearbeiten"
@@ -25489,5 +26368,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr "Unbewohnter Ort"
@@ -25495,10 +26374,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr "Unbewohnten Ort bearbeiten"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "Insel"
@@ -25506,10 +26385,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Insel bearbeiten"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr "Kleine Insel"
@@ -25517,5 +26396,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr "Kleine Insel bearbeiten"
@@ -25523,5 +26402,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "Höhleneingang"
@@ -25529,10 +26408,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "Höhleneingang bearbeiten"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Bergspitze"
@@ -25540,10 +26419,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Bergspitze bearbeiten"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "Gletscher"
@@ -25551,10 +26430,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "Gletscher bearbeiten"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "Vulkan"
@@ -25562,70 +26441,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "Vulkan bearbeiten"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Grenzen"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "Staat"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "Staatsgrenze bearbeiten"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "Innerstaatlich"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "Innerstaatliche Grenze bearbeiten"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr "Zivil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr "Zivilrechtliche Grenze bearbeiten"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr "Politisch"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "Politische Grenze bearbeiten"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr "Nationalpark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "Nationalparkgrenze bearbeiten"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Landnutzung"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Baum"
@@ -25634,15 +26513,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Baum bearbeiten"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "Botanischer Name"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "Naturwald"
@@ -25651,5 +26530,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "Naturwald bearbeiten"
@@ -25657,17 +26536,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "Nadelwald"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "Laubwald"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "Mischwald"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "Forst"
@@ -25676,14 +26555,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "Forst bearbeiten"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "Naturdenkmal & Reservat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "Naturdenkmal oder Reservat bearbeiten"
@@ -25691,25 +26570,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr "Geröll"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr "Geröll bearbeiten"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr "Buschland"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr "Buschland bearbeiten"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr "Gebirge"
@@ -25717,10 +26596,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr "Gebirge bearbeiten"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr "Heide"
@@ -25728,5 +26607,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "Heide bearbeiten"
@@ -25734,5 +26613,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr "Bauernhof"
@@ -25741,45 +26620,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr "Bauernhof bearbeiten"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "Ackerland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr "Ackerland bearbeiten"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr "Wiese"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr "Wiese bearbeiten"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "Weinberg"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "Weinberg bearbeiten"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr "Schrebergärten"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr "Schrebergärten bearbeiten"
@@ -25787,25 +26666,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "Garten"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "Garten bearbeiten"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "Gras"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr "Grasfläche bearbeiten"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr "Dorfanger"
@@ -25813,10 +26692,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr "Dorfanger bearbeiten"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr "Öffentlicher Bereich"
@@ -25824,20 +26703,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr "Öffentlichen Bereich bearbeiten"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "Park bearbeiten"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr "Erholungsgebiet"
@@ -25845,5 +26724,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr "Erholungsgebiet bearbeiten"
@@ -25851,15 +26730,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "Wohngebiet"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr "Wohngebiet bearbeiten"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "Kleiner Friedhof"
@@ -25867,9 +26746,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Kleinen Friedhof bearbeiten"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "Friedhof"
@@ -25877,39 +26756,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "Friedhof bearbeiten"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "Einkaufsbereich"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr "Einkaufsbereich bearbeiten"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "Gewerbegebiet"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr "Gewerbegebiet bearbeiten"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "Industrie"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr "Industriegebiet bearbeiten"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr "Eisenbahngelände"
@@ -25917,15 +26796,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr "Eisenbahngelände bearbeiten"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "Militärgebiet"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr "Militärgebiet bearbeiten"
@@ -25933,50 +26812,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "Baustellengebiet"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "Baustelle bearbeiten"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr "Baulücke"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr "Baulücke bearbeiten"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr "Bauland"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr "Bauland bearbeiten"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr "Deponie"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr "Deponie bearbeiten"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "Steinbruch"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "Steinbruch bearbeiten"
@@ -25986,5 +26865,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr "Ein Multipolygon bearbeiten"
@@ -25993,10 +26872,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr "Äußeres Segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr "Inneres Segment"
@@ -26004,5 +26883,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr "Abbiegeeinschränkung"
@@ -26011,5 +26890,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr "Abbiegeeinschränkung bearbeiten"
@@ -26017,34 +26896,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr "Einschränkung"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr "Nicht links abbiegen"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr "Nicht rechts abbiegen"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr "Nicht geradeaus"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr "Wendeverbot"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr "Nur rechts abbiegen"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr "Nur links abbiegen"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr "Nur geradeaus"
@@ -26053,15 +26932,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr "Von Weg"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr "Über Knoten oder Weg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr "Zu Weg"
@@ -26069,5 +26948,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr "Route"
@@ -26076,5 +26955,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr "Route bearbeiten"
@@ -26082,5 +26961,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr "Routentyp"
@@ -26171,5 +27050,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -26179,17 +27058,17 @@
 msgstr "Fahrrad"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr "Bus"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr "Straße"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr "Fähre"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr "Ski"
@@ -26249,5 +27128,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -26256,9 +27135,9 @@
 msgstr "Fuß"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr "Straßenbahn"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr "Umleitung"
@@ -26272,10 +27151,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "U-Bahn"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr "Symbolbeschreibung"
@@ -26283,31 +27162,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr "Netzwerk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr "Routenstatus"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr "geplant"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr "alternativ"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr "temporär"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr "Verbindung"
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr "Farbe (hex)"
@@ -26316,107 +27195,32 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr "Routenabschnitt"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr "Vorwärts-Abschnitt"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr "Rückwärts-Abschnitt"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr "Haltepunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr "Vorwärts-Haltepunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 msgid "backward halt point"
 msgstr "Rückwärts-Haltepunkt"
-
-#. <!--
-#. 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 "Standard"
 
 #. mappaint style named "standard"
@@ -26952,77 +27756,4 @@
 msgid "highway_track"
 msgstr "Weg"
-
-#. 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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
-msgstr "Eisenbahn"
 
 #. color rail
@@ -30548,15 +31279,35 @@
 msgstr "Sizilien - Italien"
 
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "Bild"
+#~ msgstr[1] "Bilder"
+
+#~ msgid "Open file (as raw gps, if .gpx)"
+#~ msgstr "Datei öffnen (als Roh-GPS, wenn .gpx)"
+
+#~ msgid "All installed plugins are up to date."
+#~ msgstr "Alle installierten Plugins sind aktuell."
+
+#~ msgid "Plugin not found: {0}."
+#~ msgstr "Plugin nicht gefunden: {0}."
+
+#~ msgid "Update Plugins"
+#~ msgstr "Plugins aktualisieren"
+
 #~ msgid ""
-#~ "Failed to add an OAuth authentication header. There is currently no OAuth "
-#~ "Access Token configured."
+#~ "There were problems with the following plugins:\n"
+#~ "\n"
+#~ " {0}"
 #~ msgstr ""
-#~ "Hinzufügen eines OAuth-Authentifizierungskopfes fehlgeschlagen. Aktuell "
-#~ "ist keine OAuth-Zugriffskennung konfiguriert."
-
-#~ msgid "The plugin could not be removed. Probably it was already disabled"
-#~ msgstr ""
-#~ "Das Plugin konnte nicht entfernt werden. Möglicherweise ist es bereits "
-#~ "deaktiviert."
+#~ "Es gab Probleme mit den folgenden Plugins:\n"
+#~ "\n"
+#~ " {0}"
+
+#~ msgid "Motorboat"
+#~ msgstr "Motorboot"
+
+#~ msgid "Boat"
+#~ msgstr "Boot"
 
 #~ msgid "Bridleway"
@@ -30572,31 +31323,16 @@
 #~ msgstr "Feldweg Grad 1 (asphaltiert)"
 
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Feld- oder Waldweg Grad 1 (asphaltiert) bearbeiten"
-
 #~ msgid "Track Grade 2"
 #~ msgstr "Feldweg Grad 2 (Schotter)"
 
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Feld- oder Waldweg Grad 2 (Schotter) bearbeiten"
-
 #~ msgid "Track Grade 3"
 #~ msgstr "Feldweg Grad 3 (befestigt)"
 
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Feld- oder Waldweg Grad 3 (befestigt) bearbeiten"
-
 #~ msgid "Track Grade 4"
 #~ msgstr "Feldweg Grad 4 (wenig befestigt)"
 
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Feld- oder Waldweg Grad 4 (wenig befestigt) bearbeiten"
-
 #~ msgid "Track Grade 5"
 #~ msgstr "Feldweg Grad 5 (unbefestigt)"
 
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Feld- oder Waldweg Grad 5 (unbefestigt) bearbeiten"
-
 #~ msgid "Edit Hiking"
 #~ msgstr "Wanderweg bearbeiten"
@@ -30614,22 +31350,29 @@
 #~ msgstr "Alpinen Wanderweg bearbeiten"
 
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Anspruchsvollen alpinen Wanderweg bearbeiten"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Schweren alpinen Wanderweg bearbeiten"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "ID > 0 erwartet, jedoch {0} erhalten."
-
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "Parameter ''{0}'' darf nicht null sein"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "Parameter \"{0}\" darf nicht NULL sein."
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgid "Update"
+#~ msgstr "Aktualisieren"
+
+#~ msgid "Downloaded plugin information from {0} site"
+#~ msgid_plural "Downloaded plugin information from {0} sites"
+#~ msgstr[0] "Plugin-Informationen von {0} Quelle geladen"
+#~ msgstr[1] "Plugin-Informationen von {0} Quellen geladen"
+
+#~ msgid "Download missing plugins"
+#~ msgstr "Fehlende Plugins herunterladen"
+
+#~ msgid "Set the language."
+#~ msgstr "Die Sprache festlegen."
+
+#~ msgid ""
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
+#~ "some data before --selection"
 #~ msgstr ""
-#~ "Erwartete eine Instanz von OsmDataLayer oder GpxLayer. Erhielt ''{0}''."
+#~ "Parameter werden in der Reihenfolge ausgewertet, in der sie angegeben "
+#~ "werden. Stellen Sie also sicher, dass Daten existieren, bevor der "
+#~ "Parameter --selection verwendet wird."
+
+#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
+#~ msgstr "Anstatt --download=<bbox> ist auch osm://<bbox> möglich\n"
 
 #~ msgid ""
@@ -30643,66 +31386,72 @@
 #~ "Sind Sie sich sicher, dass Sie fortfahren wollen?"
 
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "Parameter \"{0}\" darf nicht leer sein"
-
-#~ msgid "Expected array of length 4, got {0}"
-#~ msgstr "Array der Länge 4 erwartet, aber {0} erhalten"
-
-#~ msgid "Exactly four doubles excpected in string, got {0}"
+#~ msgid "No useful role ''{0}'' for Way ''{1}''."
+#~ msgstr "\"{0}\" ist keine sinnvolle Rolle für den Weg \"{1}\"."
+
+#~ msgid "Non-Way ''{0}'' in multipolygon."
+#~ msgstr "Nicht-Weg ''{0}'' im Multipolygon."
+
+#~ msgid "No outer way for multipolygon ''{0}''."
+#~ msgstr "Kein äußerer Weg im Multipolygon ''{0}''."
+
+#~ msgid "Intersection between ways ''{0}'' and ''{1}''."
+#~ msgstr "Die Wege ''{0}'' und {1}'' kreuzen sich."
+
+#~ msgid "Inner way ''{0}'' is outside."
+#~ msgstr "Innerer Weg \"{0}\" ist außerhalb."
+
+#~ msgid "Plugin {0} is required by plugin {1} but was not found."
+#~ msgstr "Das Plugin {0} wird vom Plugin {1} benötigt aber nicht gefunden."
+
+#~ msgid ""
+#~ "Activating the updated plugins failed. Check if JOSM has the permission "
+#~ "to overwrite the existing ones."
 #~ msgstr ""
-#~ "Genau zwei Gleitkommawerte in der Zeichenkette erwartet, jedoch {0} "
-#~ "erhalten"
-
-#~ msgid "Illegal double value ''{0}''"
-#~ msgstr "Ungültiger Gleitkommawert ''{0}''"
-
-#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
-#~ msgstr "Parameter ''{0}'' größer als 0 erwartet. Erhaltener Wert ''{1}''."
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "ID >= 0 erwartet, jedoch {0} erhalten."
-
-#~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
-#~ msgstr "Parameter ''{0}'' größer gleich 0 erwartet, aber {1} erhalten."
-
-#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-#~ msgstr ""
-#~ "Als Parameter \"{0}\" wurde \"{1}\" übergeben. Das ist kein gültiger Typ-"
-#~ "Name."
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr ""
-#~ "Als Parameter \"{0}\" wurde \"{1}\" übergeben. Das ist keine gültige "
-#~ "Klasse."
-
-#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
-#~ msgstr "Parameter ''{0}'' größer als 0 erwartet. Erhaltener Wert ''{1}''."
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr ""
-#~ "Der Parameter \"{0}\" muss im Bereich 0 bis {1} liegen, ist aber \"{2}\"."
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "Parameter ''{0}'' größer als 0 erwartet. Erhaltener Wert ''{1}''."
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "Parameter \"current\" außerhalb des Bereichs: Wert ist {0}"
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "Unerwarteter Spaltenindex ({0})."
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "Parameter \"col\" darf nur die Werte 0 oder 1 annehmen (col={0})."
+#~ "Aktivieren der aktualisierten Plugins fehlgeschlagen. Prüfen Sie, ob JOSM "
+#~ "die Rechte besitzt die vorhandenen Plugins zu überschreiben."
+
+#~ msgid "Edit Track of grade 1"
+#~ msgstr "Feld- oder Waldweg Grad 1 (asphaltiert) bearbeiten"
+
+#~ msgid "Edit Track of grade 2"
+#~ msgstr "Feld- oder Waldweg Grad 2 (Schotter) bearbeiten"
+
+#~ msgid "Edit Track of grade 3"
+#~ msgstr "Feld- oder Waldweg Grad 3 (befestigt) bearbeiten"
+
+#~ msgid "Edit Track of grade 4"
+#~ msgstr "Feld- oder Waldweg Grad 4 (wenig befestigt) bearbeiten"
+
+#~ msgid "Edit Track of grade 5"
+#~ msgstr "Feld- oder Waldweg Grad 5 (unbefestigt) bearbeiten"
+
+#~ msgid "Edit Demanding Alpine Hiking"
+#~ msgstr "Anspruchsvollen alpinen Wanderweg bearbeiten"
+
+#~ msgid "Edit Difficult Alpine Hiking"
+#~ msgstr "Schweren alpinen Wanderweg bearbeiten"
+
+#~ msgid "More details"
+#~ msgstr "Mehr Details"
 
 #~ msgid ">"
 #~ msgstr ">"
 
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "Parameter \"{0}\" darf nicht leer sein."
-
-#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
+#~ msgid "Plugin {0} requires JOSM update to version {1}."
+#~ msgstr "Das Plugin {0} benötigt eine JOSM-Aktualisierung auf Version {1}."
+
+#~ msgid "Conflicts in data"
+#~ msgstr "Konflikte in den Daten"
+
+#~ msgid "Plug-in named {0} is not available. Update skipped."
+#~ msgstr "Plug-in {0} ist nicht verfügbar. Update wurde übersprungen."
+
+#~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+#~ msgstr "Erwartete eine Instanz von OsmDataLayer. Erhielt ''{0}''."
+
+#~ msgid "The plugin could not be removed. Probably it was already disabled"
 #~ msgstr ""
-#~ "Parameter \"{0}\" mit Merkmalen für genau einen Schlüssel wurde erwartet. "
-#~ "Erhaltener Wert {1}."
+#~ "Das Plugin konnte nicht entfernt werden. Möglicherweise ist es bereits "
+#~ "deaktiviert."
 
 #~ msgid "Dialog not created yet. Invoke createInstance() first"
@@ -30710,20 +31459,4 @@
 #~ "Der Dialog wurde noch nicht angelegt. Rufen Sie zunächst createInstance() "
 #~ "auf."
-
-#~ msgctxt "changeset.open"
-#~ msgid "Open"
-#~ msgstr "Offen"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Closed"
-#~ msgstr "Geschlossen"
-
-#~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
-#~ msgstr ""
-#~ "Für den Parameter {0} wird ein positiver, ganzzahliger Wert benötigt. "
-#~ "Angegeben wurde aber ''{1}''."
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Konflikte in den Daten"
 
 #~ msgid ""
@@ -30736,7 +31469,92 @@
 #~ "löschen?</html>"
 
+#~ msgid "<html>"
+#~ msgstr "<html>"
+
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr ""
+#~ "Erwartete eine Instanz von OsmDataLayer oder GpxLayer. Erhielt ''{0}''."
+
+#~ msgid "Expected ID >= 0. Got {0}."
+#~ msgstr "ID >= 0 erwartet, jedoch {0} erhalten."
+
+#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
+#~ msgstr ""
+#~ "Als Parameter \"{0}\" wurde \"{1}\" übergeben. Das ist kein gültiger Typ-"
+#~ "Name."
+
+#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
+#~ msgstr ""
+#~ "Als Parameter \"{0}\" wurde \"{1}\" übergeben. Das ist keine gültige "
+#~ "Klasse."
+
+#~ msgid "Parameter current out of range. Got {0}."
+#~ msgstr "Parameter \"current\" außerhalb des Bereichs: Wert ist {0}"
+
+#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
+#~ msgstr "Parameter \"col\" darf nur die Werte 0 oder 1 annehmen (col={0})."
+
 #~ msgid "Value of child.getId() > 0 expected. Got {1}."
 #~ msgstr "Es wurde child.getId() >0 erwartet, aber stattdessen {1} erhalten."
 
+#~ msgid "Illegal value for attribute ''uid''. Got ''{0}''."
+#~ msgstr "Ungültiger Wert für Attribut \"uid\". Erhaltener Wert \"{0}\""
+
+#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
+#~ msgstr ""
+#~ "Nichtnegativer Parameter \"{0}\" erwartet, stattdessen \"{1}\" erhalten"
+
+#~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "ID-Parameter ''{0}'' > 0 verlangt. Wert ist {1}"
+
+#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "Parameter ''{0}'' größer als 0 erwartet. Erhaltener Wert ''{1}''."
+
+#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
+#~ msgstr ""
+#~ "Der Parameter \"{0}\" muss im Bereich 0 bis {1} liegen, ist aber \"{2}\"."
+
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "Parameter ''{0}'' darf nicht null sein"
+
+#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
+#~ msgstr ""
+#~ "Parameter \"{0}\" mit Merkmalen für genau einen Schlüssel wurde erwartet. "
+#~ "Erhaltener Wert {1}."
+
+#~ msgid "Object id > 0 expected. Got {0}"
+#~ msgstr "Objektnummer > 0 erwartet, jedoch {0} erhalten."
+
+#~ msgid "Id > 0 required, got {0}"
+#~ msgstr "ID > 0 erwartet, jedoch {0} erhalten."
+
+#~ msgid "Parameter ''{0}'' must not be empty"
+#~ msgstr "Parameter \"{0}\" darf nicht leer sein"
+
+#~ msgid "Illegal double value ''{0}''"
+#~ msgstr "Ungültiger Gleitkommawert ''{0}''"
+
+#~ msgid "{0} Plugin successfully downloaded."
+#~ msgid_plural "{0} Plugins successfully downloaded."
+#~ msgstr[0] "{0} Plugin erfolgreich geladen."
+#~ msgstr[1] "{0} Plugins erfolgreich geladen."
+
+#~ msgid "Please restart JOSM."
+#~ msgstr "Bitte JOSM neu starten."
+
+#~ msgid "Expected array of length 4, got {0}"
+#~ msgstr "Array der Länge 4 erwartet, aber {0} erhalten"
+
+#~ msgid "Exactly four doubles excpected in string, got {0}"
+#~ msgstr ""
+#~ "Genau zwei Gleitkommawerte in der Zeichenkette erwartet, jedoch {0} "
+#~ "erhalten"
+
+#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+#~ msgstr "Parameter ''{0}'' größer als 0 erwartet. Erhaltener Wert ''{1}''."
+
+#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
+#~ msgstr "Parameter ''{0}'' größer als 0 erwartet. Erhaltener Wert ''{1}''."
+
 #~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
 #~ msgstr "Parameter ''{0}'' größer als 0 erwartet. Erhaltener Wert ''{1}''."
@@ -30745,20 +31563,41 @@
 #~ msgstr "ID-Parameter ''{0}'' > 0 verlangt. Wert ist {1}."
 
-#~ msgid "Object id > 0 expected. Got {0}"
-#~ msgstr "Objektnummer > 0 erwartet, jedoch {0} erhalten."
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "Bild"
-#~ msgstr[1] "Bilder"
-
-#~ msgid "Illegal value for attribute ''uid''. Got ''{0}''."
-#~ msgstr "Ungültiger Wert für Attribut \"uid\". Erhaltener Wert \"{0}\""
-
-#~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-#~ msgstr "Erwartete eine Instanz von OsmDataLayer. Erhielt ''{0}''."
-
-#~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "ID-Parameter ''{0}'' > 0 verlangt. Wert ist {1}"
+#~ msgid "Delete old plugin {0}"
+#~ msgstr "Altes Plugin {0} entfernen"
+
+#~ msgid "Delete old plugin file {0}"
+#~ msgstr "Alte Plugindatei {0} entfernen"
+
+#~ msgid "Expected value > 0 for parameter ''{0}'', got {1}"
+#~ msgstr "Anstatt {1} wird ein Wert > 0 für den Parameter \"{0}\" erwartet."
+
+#~ msgctxt "changeset.open"
+#~ msgid "Open"
+#~ msgstr "Offen"
+
+#~ msgctxt "changeset.open"
+#~ msgid "Closed"
+#~ msgstr "Geschlossen"
+
+#~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
+#~ msgstr "Parameter ''{0}'' größer gleich 0 erwartet, aber {1} erhalten."
+
+#~ msgid "Parameter ''{0}'' of type node expected, got ''{1}''"
+#~ msgstr "Parameter ''{0}'' vom Typ Knoten erwartet, aber ''{1}'' erhalten"
+
+#~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
+#~ msgstr ""
+#~ "Für den Parameter {0} wird ein positiver, ganzzahliger Wert benötigt. "
+#~ "Angegeben wurde aber ''{1}''."
+
+#~ msgid " (<a href=\"urn:changeset-configuration\">configure changeset</a>)"
+#~ msgstr ""
+#~ " (<a href=\"urn:changeset-configuration\">Änderungssatz konfigurieren</a>)"
+
+#~ msgid "multipolygon way ''{0}'' is not closed."
+#~ msgstr "Multipolygon-Weg ''{0}'' ist nicht geschlossen."
+
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "Parameter \"{0}\" darf nicht NULL sein."
 
 #~ msgid "Expected value of type integer > 0 for parameter ''{0}'', got {1}"
@@ -30766,126 +31605,4 @@
 #~ "Für den Parameter \"{0}\" wird eine positive ganze Zahl erwartet. "
 #~ "Erhalten: {1}."
-
-#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-#~ msgstr ""
-#~ "Nichtnegativer Parameter \"{0}\" erwartet, stattdessen \"{1}\" erhalten"
-
-#~ msgid "Expected value > 0 for parameter ''{0}'', got {1}"
-#~ msgstr "Anstatt {1} wird ein Wert > 0 für den Parameter \"{0}\" erwartet."
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "Das Plugin {0} benötigt eine JOSM-Aktualisierung auf Version {1}."
-
-#~ msgid "<html>"
-#~ msgstr "<html>"
-
-#~ msgid "Expected unique id > 0 for primitive id, got {0}"
-#~ msgstr "Erwartete unique id >0 für Primitive id, bekam {0}"
-
-#~ msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}"
-#~ msgstr ""
-#~ "Erwarteter Wert des Typs long > 0 für den Parameter \"{0}\", bekam {1}"
-
-#~ msgid "Parameter ''{0}'' of type node expected, got ''{1}''"
-#~ msgstr "Parameter ''{0}'' vom Typ Knoten erwartet, aber ''{1}'' erhalten"
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Datei öffnen (als Roh-GPS, wenn .gpx)"
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Alle installierten Plugins sind aktuell."
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Plugin nicht gefunden: {0}."
-
-#~ msgid "Update Plugins"
-#~ msgstr "Plugins aktualisieren"
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Es gab Probleme mit den folgenden Plugins:\n"
-#~ "\n"
-#~ " {0}"
-
-#~ msgid "Update"
-#~ msgstr "Aktualisieren"
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "Plugin-Informationen von {0} Quelle geladen"
-#~ msgstr[1] "Plugin-Informationen von {0} Quellen geladen"
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Fehlende Plugins herunterladen"
-
-#~ msgid "Set the language."
-#~ msgstr "Die Sprache festlegen."
-
-#~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
-#~ msgstr ""
-#~ "Parameter werden in der Reihenfolge ausgewertet, in der sie angegeben "
-#~ "werden. Stellen Sie also sicher, dass Daten existieren, bevor der "
-#~ "Parameter --selection verwendet wird."
-
-#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-#~ msgstr "Anstatt --download=<bbox> ist auch osm://<bbox> möglich\n"
-
-#~ msgid "No useful role ''{0}'' for Way ''{1}''."
-#~ msgstr "\"{0}\" ist keine sinnvolle Rolle für den Weg \"{1}\"."
-
-#~ msgid "Non-Way ''{0}'' in multipolygon."
-#~ msgstr "Nicht-Weg ''{0}'' im Multipolygon."
-
-#~ msgid "No outer way for multipolygon ''{0}''."
-#~ msgstr "Kein äußerer Weg im Multipolygon ''{0}''."
-
-#~ msgid "Intersection between ways ''{0}'' and ''{1}''."
-#~ msgstr "Die Wege ''{0}'' und {1}'' kreuzen sich."
-
-#~ msgid "Inner way ''{0}'' is outside."
-#~ msgstr "Innerer Weg \"{0}\" ist außerhalb."
-
-#~ msgid "Plugin {0} is required by plugin {1} but was not found."
-#~ msgstr "Das Plugin {0} wird vom Plugin {1} benötigt aber nicht gefunden."
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Aktivieren der aktualisierten Plugins fehlgeschlagen. Prüfen Sie, ob JOSM "
-#~ "die Rechte besitzt die vorhandenen Plugins zu überschreiben."
-
-#~ msgid "More details"
-#~ msgstr "Mehr Details"
-
-#~ msgid "Plug-in named {0} is not available. Update skipped."
-#~ msgstr "Plug-in {0} ist nicht verfügbar. Update wurde übersprungen."
-
-#~ msgid "{0} Plugin successfully downloaded."
-#~ msgid_plural "{0} Plugins successfully downloaded."
-#~ msgstr[0] "{0} Plugin erfolgreich geladen."
-#~ msgstr[1] "{0} Plugins erfolgreich geladen."
-
-#~ msgid "Please restart JOSM."
-#~ msgstr "Bitte JOSM neu starten."
-
-#~ msgid "Delete old plugin {0}"
-#~ msgstr "Altes Plugin {0} entfernen"
-
-#~ msgid "Delete old plugin file {0}"
-#~ msgstr "Alte Plugindatei {0} entfernen"
-
-#~ msgid " (<a href=\"urn:changeset-configuration\">configure changeset</a>)"
-#~ msgstr ""
-#~ " (<a href=\"urn:changeset-configuration\">Änderungssatz konfigurieren</a>)"
-
-#~ msgid "multipolygon way ''{0}'' is not closed."
-#~ msgstr "Multipolygon-Weg ''{0}'' ist nicht geschlossen."
 
 #~ msgid ""
@@ -30898,2 +31615,22 @@
 #~ "      folgender Java-Option der nutzbare Speicher für das Programm erhöht "
 #~ "werden."
+
+#~ msgid "Unexpected column index. Got {0}."
+#~ msgstr "Unerwarteter Spaltenindex ({0})."
+
+#~ msgid "Parameter ''{0}'' must not be empty."
+#~ msgstr "Parameter \"{0}\" darf nicht leer sein."
+
+#~ msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}"
+#~ msgstr ""
+#~ "Erwarteter Wert des Typs long > 0 für den Parameter \"{0}\", bekam {1}"
+
+#~ msgid "Expected unique id > 0 for primitive id, got {0}"
+#~ msgstr "Erwartete unique id >0 für Primitive id, bekam {0}"
+
+#~ msgid ""
+#~ "Failed to add an OAuth authentication header. There is currently no OAuth "
+#~ "Access Token configured."
+#~ msgstr ""
+#~ "Hinzufügen eines OAuth-Authentifizierungskopfes fehlgeschlagen. Aktuell "
+#~ "ist keine OAuth-Zugriffskennung konfiguriert."
Index: applications/editors/josm/i18n/po/el.po
===================================================================
--- applications/editors/josm/i18n/po/el.po	(revision 19689)
+++ applications/editors/josm/i18n/po/el.po	(revision 19698)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-19 00:01-0500\n"
-"PO-Revision-Date: 2010-01-15 13:57-0500\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-23 22:25+0000\n"
 "Last-Translator: alichani <alichani@yahoo.co.uk>\n"
 "Language-Team: Greek <el@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-01-13 18:24+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -70,11 +70,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -235,5 +235,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -247,13 +247,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -262,5 +262,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -286,5 +289,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Συγχώνευση"
@@ -313,5 +316,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -378,9 +381,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -388,5 +391,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "Εντάξει"
@@ -437,6 +442,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -454,5 +459,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -461,11 +466,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -502,5 +507,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "σύγκρουση"
@@ -631,14 +636,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Αντιγραφή"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Αντιγραφή επιλεγμένων αντικειμένων στο πρόχειρο."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Παρακαλώ επιλέξτε κάτι για αντιγραφή."
@@ -669,8 +674,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -679,5 +684,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -735,16 +740,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Υπήρξαν {0} συγκρούσεις κατά την εισαγωγή."
-msgstr[1] "Υπήρξαν {0} συγκρούσεις κατά την εισαγωγή."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "Διενέξεις κατά την λήψη"
-msgstr[1] "Διενέξεις κατά την λήψη"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -765,4 +769,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -772,4 +778,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Αντιγραφή επιλογής με αντιγραφή και άμεση επικόλληση."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Αντιγραφή"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+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:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "Επίπεδο: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, 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 ""
 
 #. <button label="Info" hotkey="I">
@@ -981,5 +1015,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "URL"
@@ -1129,5 +1163,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr ""
 
@@ -1141,9 +1175,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Άνοιγμα αρχείων"
-msgstr[1] "Άνοιγμα αρχείων"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1199,7 +1233,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1213,5 +1247,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "Μετακίνηση κόμβων ώστε όλες οι γωνίες να είναι 90 ή 270 μοίρες"
 
@@ -1245,4 +1280,8 @@
 "undesirable results when doing rectangular alignments.<br>Change your "
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+msgid "Selection must consist only of ways and nodes."
 msgstr ""
 
@@ -1258,4 +1297,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204
 msgid "Selected Elements cannot be orthogonalized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
 msgstr ""
 
@@ -1362,18 +1411,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1398,12 +1447,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Σφάλμα"
@@ -1535,5 +1585,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1675,7 +1725,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:106
-#, fuzzy
 msgid "None of this way''s nodes are glued to anything else."
-msgstr "Κανείς από αυτούς τούς κόμβους δεν είναι κολλημένος σε τίποτε άλλο."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:115
@@ -1729,9 +1778,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "Αντιγραφή {0} κόμβων σε {1} κόμβους"
-msgstr[1] "Αντιγραφή {0} κόμβων σε {1} κόμβους"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1775,5 +1824,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr ""
@@ -2189,6 +2238,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2268,7 +2317,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
-#, fuzzy
 msgid "<not>"
-msgstr "βόρεια"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
@@ -2310,5 +2358,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Αναζήτηση αντικειμένων."
@@ -2492,5 +2540,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Αναζήτηση"
@@ -2530,25 +2578,22 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "CS"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
-msgstr "CI"
+msgstr ""
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
-msgstr "RX"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2558,9 +2603,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2693,9 +2738,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "Αλλαγή {0} αντικειμένου"
-msgstr[1] "Αλλαγή {0} αντικειμένων"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2745,12 +2790,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "Αφαίρεση \"{0}\" για {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Ρύθμιση {0}={1} για {2} {3}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2808,17 +2853,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Κατάσταση Διαγραφής"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Επίπεδο Δεδομένων {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Διαγραφή από σχέση"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2899,9 +2944,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "Αλλαγή {0} αντικειμένου"
-msgstr[1] "Αλλαγή {0} αντικειμένων"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -2961,12 +3006,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for way {0}"
-msgstr "Επίλυση συγκρούσεων"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Σίγουρα επιθυμήτε την διαγραφή της επιλογής από την σχέση {0};"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3211,5 +3256,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3217,5 +3262,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3223,5 +3268,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3229,5 +3274,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3306,15 +3351,13 @@
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "CS"
+msgstr ""
 
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
-#, fuzzy
 msgctxt "filter"
 msgid "I"
-msgstr "CI"
+msgstr ""
 
 #. column header: filter mode
@@ -3327,8 +3370,7 @@
 #. filter mode: replace
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210
-#, fuzzy
 msgctxt "filter"
 msgid "R"
-msgstr "RX"
+msgstr ""
 
 #. filter mode: add
@@ -3350,19 +3392,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3371,5 +3413,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3377,5 +3419,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3498,6 +3540,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3507,5 +3549,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3516,7 +3558,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3538,5 +3580,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "φόντο"
@@ -3680,6 +3722,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3687,37 +3729,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "μη ολοκληρωμένη"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "Οδός ταχείας κυκλοφορίας"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "σιδηρόδρομος"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "υδατόρρευμα"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "χρήση γής"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3726,10 +3769,10 @@
 msgstr[1] "{0} κόμβοι"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3738,5 +3781,5 @@
 msgstr[1] "{0} μέλη"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3773,6 +3816,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Διένεξη"
@@ -3783,7 +3826,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-#, fuzzy
-msgid "Authorization Failed"
-msgstr "Η σύνδεση απέτυχε."
+msgid "Authorisation Failed"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
@@ -3982,5 +4024,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Αρχικοποίηση"
@@ -4021,5 +4062,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4030,5 +4071,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Επεξεργασία"
@@ -4099,29 +4140,29 @@
 msgstr "κλίμακα"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Το γεωγραφικό μήκος στο σημείο του ποντικιού."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The name of the object at the mouse pointer."
 msgstr "Το όνομα του αντικειμένου στο σημείο του ποντικιού."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Το γεωγραφικό πλάτος στο σημείο του ποντικιού."
 
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+msgid "The angle between the previous and the current way segment."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
-msgid "The 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:105
-msgid "The (compass) heading of the line segment being drawn."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
 msgid "The length of the new way segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4129,9 +4170,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(κανένα αντικείμενο)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4291,9 +4332,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Διόρθωση συγκρούσεων ετικετών"
-msgstr[1] "Διόρθωση συγκρούσεων ετικετών"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
@@ -4355,16 +4396,16 @@
 msgstr "Επίλυση σύγκρουσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4563,8 +4604,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr "Συγχώνευση κόμβων στον παλαιότερο."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4712,5 +4757,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr "Όχι, ακύρωση"
@@ -4756,5 +4801,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -4884,10 +4934,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "καμοία"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "όλα"
@@ -4967,7 +5017,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -4977,6 +5027,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5156,10 +5206,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5179,13 +5229,13 @@
 msgstr "Σωρός Εντολών: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Επίλυση"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
@@ -5193,6 +5243,6 @@
 "λίστα."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5225,5 +5275,5 @@
 "<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.Click <strong>{0}</strong> to close anyway."
+"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.</"
@@ -5249,5 +5299,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5256,5 +5306,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5334,43 +5384,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Επίπεδα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 msgid "Open a list of all loaded layers."
 msgstr "Άνοιγμα λίστας όλων τον φορτωμένων απιπέδων."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Εμφάνιση/Απόκρυψη"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Αντιγραφή"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 msgid "Move the selected layer one row up."
 msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή πάνω."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Μετακίνηση του επιλεγμένου επιπέδου μία γραμμή κάτω."
@@ -5384,6 +5439,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Σχέσεις"
@@ -5393,69 +5448,69 @@
 msgstr "Άνοιγμα λίστας όλων τον σχέσεων."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "Σχέσεις: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Άνοιγμα επεξεργαστή για την επιλεγμένη σχέση"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Διαγραφή της επιλεγμένης σχέσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Σημιουργία νέας σχέσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Τρέχουσα επιλογή"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Άνοιγμα παραθύρου λίστας επιλογμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Ζούμ στα επιλεγμένα στοιχεία"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Ζουμ στην επιλογή"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Επιλ.: Σχεσ.:{0} / WaysQ{1} / Κόμβοι:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5463,5 +5518,5 @@
 msgstr "Επιλογή"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5815,8 +5870,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -5888,4 +5941,7 @@
 #. <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 />
@@ -5964,6 +6020,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6005,6 +6062,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6473,152 +6532,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Όνομα"
@@ -7001,5 +7062,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<διαφορετικά>"
@@ -7055,55 +7116,55 @@
 msgstr "Προσθήκη Ιδιοτήτων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Ιδιότητες: {0} / Υπαγωγές: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Ιδιότητες / Υπαγωγές"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Αλλαγή σχέσης"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "Διαγραφή από σχέση"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Σίγουρα επιθυμήτε την διαγραφή της επιλογής από την σχέση {0};"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Διαγραφή του επιλεγμένου κλειδιού από όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "Διαγραφή Ιδιοτήτων"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Προσθήκη νέου ζεύγους κλειδιού/τιμής σε όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Επεξεργασία της τιμής του επιλεγμένου κλειδιού για όλα τα αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7430,7 +7491,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
-#, fuzzy
 msgid "Do you really want to apply the new role?"
-msgstr "Θέλετε να το επιτρέψετε;"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
@@ -7546,47 +7606,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Σελιδοδείκτες"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../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:187
+#: ../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:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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:212
+#: ../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:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr ""
@@ -7712,18 +7771,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -7734,34 +7793,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../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:111
+#: ../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:147
+#: ../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:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr ""
@@ -7772,7 +7831,9 @@
 #. 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" />
@@ -7781,10 +7842,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Τύπος"
@@ -7793,5 +7855,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -7803,17 +7865,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "άγνωστο"
@@ -8158,5 +8219,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr ""
@@ -8600,9 +8661,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8612,7 +8673,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -8624,16 +8685,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "Επίπεδο"
@@ -9046,68 +9107,68 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "σημείο gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Προσαρμογή του σχεδιασμού γραμμών"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Use global settings."
 msgstr "Χρηση καθολικών ρυθμίσεων."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Προσαρμογή Χρώματος"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Προκαθορισμένο"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Επιλέξτε ένα χρώμα"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr "Σημάδια από Ονομασμένα Σημεία"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Εισαγωγή Ήχου"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9117,23 +9178,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Αρχεία Κυματομορφής (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Σημάδια ήχου από {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Εισαγωγή εικόνων"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9143,5 +9204,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9149,5 +9210,5 @@
 msgstr "Όνομα: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9155,5 +9216,5 @@
 msgstr "Περιγραφή: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9163,23 +9224,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "Περιγραφή"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Μήκος: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9188,5 +9249,5 @@
 msgstr[1] "{0} διαδρομές, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9195,10 +9256,10 @@
 msgstr[1] "{0} σημεία αναφοράς"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Μετατροπή σε επίπεδο δεδομένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9208,43 +9269,43 @@
 "βλαβερή.<br>Αν θέλετε να αποστείλετε ίχνη, κοιτάξτε εδώ:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Μετατράπηκε από: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "Λήψη από OSM κατά μηκός αυτού του ίχνους"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Λήψη όλων εντός:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} μέτρα"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "Μέγιστη περιοχή ανά αίτημα:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} τετρ. χλμ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9255,10 +9316,10 @@
 "συνεχίσετε;</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 "Δεν υπάρχει διαθέσιμο ίχνος GPX  στο επίπεδο για την συσχέτιση με τον ήχο."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9266,5 +9327,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9272,23 +9333,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Επίπεδο Δεδομένων {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "εκτός περιοχής λήψης"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr "έκδοση {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9297,5 +9358,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9309,5 +9370,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9320,11 +9381,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9333,32 +9394,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "το {0} αποτελείται από:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr "Έκδοση API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Μετατροπή σε επίπεδο GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9405,28 +9466,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "Σημεία GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Αρχεία GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Σφάλμα κατά την ερμηνεία {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Αδυναμία ανάγνωσης \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9435,34 +9495,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr "Ώρα φωτογραφίας (από exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 msgid "Gps time (read from the above photo): "
 msgstr "Ώρα Gps (διαβάστε από την παραπάνω φωτογραφία): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [ηη/μμ/εεεε ωω:λλ:δδ]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr "Βρίσκομαι στην ζώνη ώρας: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "Χωρίς ημερομηνία"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr "Άνοιγμα άλλης φωτογραφίας"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Συγχρονισμός ώρας από φωτογραφία του δέκτη GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9470,64 +9530,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "Μη έγκυρη ημερομηνία"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr "Ίχνος GPX: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr "Άνοιγμα άλλου ίχνους GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr "Ζώνη Ώρας: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr "Μετατόπιση:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9537,45 +9597,45 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr "Συσχέτιση"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr "Λανθασμένη ζώνη ώρας"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Ζώνη ώρας: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Λεπτά: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Δευτερόλεπτα: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9584,5 +9644,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9590,40 +9650,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr "Ρύθμιση ζώνης ώρας και απόκλεισης"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 msgid "The selected photos do not contain time information."
 msgstr "Οι επιλεγμένες φωτογραφίες δεν περιέχουν πληροφορίες ώρας."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr "Οι φωτογραφίες δεν περιέχουν πληροφορίες ώρας"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
 "one."
-msgstr "Οι επιλεγμένες φωτογραφίες δεν περιέχουν πληροφορίες ώρας."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr "Τ οίχνος GPX δεν περιέχει πληροφορίες ώρας"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr "Πρέπει να επιλέξετε ένα ίχνος GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr "Δεν επιλέχθηκε ίχνος GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9632,5 +9691,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9639,63 +9698,63 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "Εξαγωγή τοποθεσιών GPS από EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr "Έναρξη σάρωσης καταλόγου"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "Ανάγνωση φωτογραφιών"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Ανάγνωση {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Σάρωση καταλόγου {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Βρέθηκε μηδενικό αρχείο στον κατάλογο {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Σφάλμα κατά την λήψη αρχείων από τον κατάλογο {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "Δε φορτώθηκαν δεδομένα."
-msgstr[1] "Δε φορτώθηκαν δεδομένα."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -9704,10 +9763,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -9716,5 +9775,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -9811,5 +9870,5 @@
 msgstr "σημάδι gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -9817,5 +9876,5 @@
 msgstr[1] "σημάδια"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -9824,9 +9883,9 @@
 msgstr[1] "{0} αποτελείται από {1} σημάδια"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "Συγχρονισμός ήχου"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -9835,20 +9894,20 @@
 "συγχρονισμού."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../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:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -9856,18 +9915,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Εμφάνιση/Απόκρυψη Κειμένου/Εικονιδίων"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
 "Εναλλαγή κατάστασης ορατότητας του κειμένου και των εικονιδίων των σημαδιών."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
+#: ../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 "
@@ -9875,5 +9934,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -9881,5 +9940,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "Αδυναμία δημιουργίας νέου σημαδιού ήχου."
@@ -9906,5 +9965,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
 #, java-format
 msgid ""
@@ -9912,5 +9971,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
 #, java-format
 msgid ""
@@ -9962,7 +10021,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
 msgid "Authorize URL:"
-msgstr "Συγγραφέας"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10052,7 +10110,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
 msgid "Authorize now"
-msgstr "Συγγραφέας"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10111,7 +10168,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
-#, fuzzy
 msgid "OAuth authorization failed"
-msgstr "Η σύνδεση απέτυχε."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
@@ -10191,7 +10247,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
 msgid "Please select an authorization procedure: "
-msgstr "Παρακαλώ επιλέξτε τουλάχιστον τέσσερεις κόμβους."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10201,7 +10256,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
-#, fuzzy
 msgid "Close the dialog and cancel authorization"
-msgstr "Κλείσιμο διαλόγου και ακύρωση λήψης"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
@@ -10516,5 +10570,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Παρακαλώ επιλέξτε την γραμμή για επεξεργασία."
@@ -10528,5 +10582,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10665,9 +10719,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "Επίπεδο: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -10697,6 +10746,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr "Όλα"
@@ -10735,8 +10784,8 @@
 msgstr ""
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Αυτοκίνητο"
@@ -10758,13 +10807,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Ποδήλατο"
@@ -10797,12 +10846,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "Πεζοί"
@@ -10854,11 +10903,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
-#, fuzzy
 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:106
@@ -11767,5 +11813,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -11773,18 +11826,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Άγνωστος τύπος: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -11795,16 +11848,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Σφάλμα ανάλυσης {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Υποστηρίζονται στοιχεία τύπου {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -11813,18 +11866,17 @@
 msgstr[1] "Αλλαγή {0} αντικειμένων"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "Τίποτα επιλεγμένο!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "Εφαρμογή Προεπιλογής"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Αλλαγή ιδιοτήτων"
@@ -12100,6 +12152,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12124,9 +12176,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12142,7 +12194,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
-#, fuzzy
 msgid "Looking for image files"
-msgstr "Αναζήτηση ακτογραμμής..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
@@ -12150,7 +12201,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
@@ -12222,5 +12279,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "Εισήχθησαν συντεταγμένες: "
@@ -12321,9 +12378,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Αλλαγή {0} αντικειμένου"
-msgstr[1] "Αλλαγή {0} αντικειμένων"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -12951,5 +13008,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -12958,7 +13015,5 @@
 "are:"
 msgstr[0] ""
-"Το πρόσθετο {0} είναι απαραίτητο από το πρόσθετο {1} αλλά δεν βρέθηκε."
 msgstr[1] ""
-"Το πρόσθετο {0} είναι απαραίτητο από το πρόσθετο {1} αλλά δεν βρέθηκε."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13130,7 +13185,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:69
-#, fuzzy, java-format
+#, java-format
 msgid "The plugin file ''{0}'' does not include a Manifest."
-msgstr "Το αρχείο \"{0}\" δεν υπάρχει"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:181
@@ -13227,5 +13282,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13233,9 +13287,4 @@
 "file a bug report."
 msgstr ""
-"Μια μη αναμενόμενη εξαίρεση έγινε.\n"
-"\n"
-"Αυτό είναι πάντα ένα σφάλμα στο κώδικα. Εάν τρέχεις τη τελευταία\n"
-"έκδοση του JOSM, παρακαλώ σκέψου να είσαι καλός και να κάνεις μια αναφορά "
-"για bug."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13327,6 +13376,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -13442,6 +13491,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13450,5 +13499,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -13597,4 +13646,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr ""
@@ -13685,5 +13735,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "Παρεμβολή Διευθύνσεων"
@@ -14266,5 +14316,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr "Θέση"
@@ -14423,21 +14473,21 @@
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr ""
@@ -14469,9 +14519,9 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -14486,13 +14536,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr ""
@@ -14501,6 +14551,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr ""
@@ -14726,17 +14776,17 @@
 msgstr "Φόρτωση ομάδας εικόνων ως νέο επίπεδο."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../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:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -14780,42 +14830,41 @@
 msgstr "Αφαίρεση διπλών κόμβων..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../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:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "ανατολικά"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "βορειοανατολικά"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "βόρεια"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "βορειοδυτικά"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "δυτικά"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "νοτιοδυτικά"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "νότια"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "νοτιοανατολικά"
@@ -14871,6 +14920,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -14879,73 +14928,73 @@
 msgstr "νερό"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "ακτογραμμή"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "γη"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../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:43
+#: ../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:45
+#: ../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:47
+#: ../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:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Ανάλυση πλακιδίων Landsat (pixel ανά μοίρα)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Μέγεθος πλακιδίων Landsat (pixels)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../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:55
+#: ../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:57
+#: ../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:59
+#: ../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:61
+#: ../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:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr "Μέγιστο μέγεθος cache (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
 msgid "Maximum cache age (days)"
 msgstr "Μέγιστη ηλικία cache (ημέρες)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
+#: ../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:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14953,5 +15002,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -14959,5 +15008,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14968,5 +15017,5 @@
 "γραμμές. Default 0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -14975,5 +15024,5 @@
 "τιμή 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
@@ -14981,50 +15030,50 @@
 "2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../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:77
+#: ../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:78
+#: ../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:79
+#: ../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:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 "Μέγιστο μέγεθος κάθε καταλόγου cache σε bytes. Προκαθορισμένη τιμή 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../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:48
+#: ../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:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr ""
@@ -15048,5 +15097,5 @@
 msgstr "Η σύνδεση απέτυχε"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr ""
@@ -15077,5 +15126,5 @@
 msgstr "Πορεία"
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr "Επίπεδο LiveGPS"
@@ -15151,5 +15200,5 @@
 msgstr "Γωνία μεταξύ δύο επιλεγμένων Κόμβων"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr "Επίπεδο για την λήψη μετρήσεων"
@@ -15413,4 +15462,76 @@
 msgid "Firefox executable"
 msgstr "εκτελέσιμο Firefox"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#, fuzzy
+msgid "Read error!"
+msgstr "Ταμιευτήρας"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Εισάγετε τις συντεταγμένες για τον νέο κόμβο."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Δημιουργία αντιγράφων ασφαλείας"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Σφάλμα"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "Η ώρα ποθ εισήχθει δεν μπόρεσε να ερμηνευθεί."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Αδυναμία μετονομασίας αρχείου ''{0}''"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Δημιουργία αντιγράφων ασφαλείας"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "Δημιουργία αντιγράφων ασφαλείας"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Αντικατάσταση"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+#, fuzzy
+msgid "Could not delete temporary file!"
+msgstr "Δεν βρέθηκε ο τύπος του στοιχείου"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
@@ -15683,6 +15804,6 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -15804,72 +15925,126 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+msgid "Terrace a house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+msgid "Interpolation"
+msgstr "Παρεμβολή"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Οδοί"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Αριθμοί πλακιδίων"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Αριθμός Σημείου"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+msgid "Lowest housenumber of the terraced house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Σημιουργία νέας σχέσης"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+msgid "delete outline way"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Όνομα οδού"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../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:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr "Δημιουργεί ξεχωριστά κτίρια  από ένα μακρύ κτίριο."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr ""
@@ -16103,5 +16278,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr ""
@@ -16111,5 +16286,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16121,9 +16296,9 @@
 "μπορεί να τους χρησιμοποιούν.<br>Είστε σίγουροι οτι επιθυμείτε διαγραφή;"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr ""
@@ -16158,5 +16333,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr ""
@@ -16303,7 +16478,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -16311,80 +16486,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Το κλειδί \"{0}\" δεν είναι έγκυρο."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr "Ετικέτες χωρίς τιμές"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Το κλειδί \"{0}\" δεν υπάρχει στις προεπιλογές"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Η τιμή \"{0}\" για το κλειδί \"{1}\" δεν υπάρχει στις προεπιλογές."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr "Έλεγχος τιμών ιδιοτήτων."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16392,86 +16567,86 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr "Προσθήκη νέας πηγής στην λίστα."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr "Επιξεργασία της επιλεγμένης πηγής."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "Διαγραφή της επιλεγμένης πηγής από την λίστα."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "Πηγές δεδομένων"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr "Έλεγχος τιμών ιδιοτήτων."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr "Έλεγχος για FIXMES."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Χρήση του προεπιλεγμένου αρχείου ορθογραφικού ελέγχου (προτείνεται)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr "Διόρθωση ιδιοτήτων"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr "Δεν βρέθηκε ο τύπος του στοιχείου"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -16911,5 +17086,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -16920,64 +17095,64 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
-msgid ""
-"The requested area is too big. Please zoom in a little, or change resolution"
-msgstr ""
-"Η ζητούμενη περιοχή είναι πολύ μεγάλη. Παρακαλώ κάντε ζουμ, ή αλλάξτε ανάλυση"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
 msgid "Download visible tiles"
 msgstr "Λήψη εμφανών πλακιδίων"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+msgid ""
+"The requested area is too big. Please zoom in a little, or change resolution"
+msgstr ""
+"Η ζητούμενη περιοχή είναι πολύ μεγάλη. Παρακαλώ κάντε ζουμ, ή αλλάξτε ανάλυση"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "Αλλαγή ανάλυσης"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr "Ανανέωση λανθασμένων πλακιδίων"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr "Κανάλι άλφα"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "Αποθ'ηκευση επιπέδου WMS σε αρχείο"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr "Αποθήκευση επιπέδου WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "Φόρτωση επιπέδου WMS από αρχείο"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr "Φόρτωση επιπέδου WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "Μη υποστηριζόμενη έκδοση αρχείου WMS΄ βρέθηκε {0}, αναμενόταν {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr "Σφάλμα μορφής αρχείου"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "Σφάλμα φόρτωσης αρχείου"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -17232,6 +17407,13 @@
 msgstr ""
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17240,15 +17422,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr "Επιτρέπει άλλες εφαρμογές να στέλνουν εντολές στο JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17257,10 +17439,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr "Παρέχει δυνατότητες δρομολόγησης."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17269,15 +17451,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17287,10 +17469,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17299,5 +17481,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17309,10 +17491,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -17419,6 +17601,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -17426,6 +17617,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr ""
@@ -17442,5 +17634,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Λωρίδες κυκλοφορίας"
@@ -17462,10 +17654,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Μεγ. Ταχύτητα (χαω)"
@@ -17509,14 +17701,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "Μονόδρομος"
@@ -17559,13 +17751,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -17603,13 +17795,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Σήραγγα"
@@ -17644,13 +17836,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr ""
@@ -17685,13 +17877,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr ""
@@ -17822,4 +18014,13 @@
 #: build/trans_presets.java:225
 msgid "Edit Unclassified Road"
+msgstr ""
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
 msgstr ""
 
@@ -17838,15 +18039,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr "Πλάτος (μέτρα)"
@@ -17858,5 +18059,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Οικιστική"
@@ -17865,5 +18066,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "Επεξεργασία οικιστικής οδού"
@@ -17881,16 +18082,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Επιφάνεια"
@@ -17912,166 +18116,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "άλσος"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "χαλίκι"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "χόρτο"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "άμμος"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr ""
@@ -18079,5 +18290,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr ""
@@ -18086,5 +18297,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr ""
@@ -18092,5 +18303,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "Πεζόδρομος"
@@ -18099,5 +18310,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "Επεξεργασία Πεοζόδρομου"
@@ -18105,5 +18316,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr ""
@@ -18112,5 +18323,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr ""
@@ -18120,18 +18331,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr ""
@@ -18139,5 +18350,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr ""
@@ -18147,5 +18358,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -18153,5 +18364,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -18160,5 +18371,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -18167,20 +18378,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "Διόδια"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "Αδιέξοδο"
@@ -18188,9 +18399,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 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"
@@ -18201,6 +18413,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18212,4 +18422,5 @@
 #. 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"
@@ -18228,141 +18439,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "ιδιωτικό"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr ""
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr "αγροτικό"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "ιδιωτικό"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "προορισμός"
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr ""
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr "αγροτικό"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "όχι"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -18377,10 +18596,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr "Άλογο"
@@ -18396,10 +18615,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "Μοτοσυκλέτα"
@@ -18414,27 +18633,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr "Αυτοκίνητο"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr ""
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "Καράβι"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Ελαχ. ταχύτητα (χαω)"
@@ -18442,25 +18653,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "Μεγ. βάρος (τόνοι)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr "Μέγιστο Ύψος (μέτρα)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr "Μέγιστο Πλάτος (μέτρα)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr "Μέγιστο Μήκος (μέτρα)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "Κυκλικός κόμβος"
@@ -18471,5 +18682,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr ""
@@ -18489,10 +18700,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "Αυτοκινητόδρομος"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr ""
@@ -18514,10 +18725,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr ""
@@ -18539,10 +18750,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "πρωτεύων"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr ""
@@ -18564,5 +18775,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -18577,9 +18788,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr "αταξινόμητος"
@@ -18593,9 +18804,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "Οικιστική"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr ""
@@ -18625,10 +18836,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr ""
@@ -18658,5 +18869,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -18668,10 +18879,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Επεξεργασία Γέφυρας"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr "Σήραγγα"
@@ -18679,19 +18890,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr ""
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr ""
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "Επεξεργασία οδού ταχείας κυκλοφορίας υπό κατασκευή"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "Κόμβος"
@@ -18707,5 +18918,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "κυκλικός κόμβος"
@@ -18713,5 +18924,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr ""
@@ -18720,40 +18931,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "Τύπος"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "χαλίκι"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "χαλίκι"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "χαλίκι"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "χαλίκι"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "χαλίκι"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr ""
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -18761,5 +18966,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -18767,30 +18972,26 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr "πεζοπορία"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "Ορειβασία"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
-msgstr "Απαιτητική Ορειβασία"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
-msgstr "πεζοπορία"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
-msgstr "Απαιτητική Ορειβασία"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
 msgstr ""
@@ -18798,5 +18999,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "Μονοπάτι"
@@ -18805,12 +19006,32 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "Επεξεργασία μονοπατιού"
 
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
+
 #: build/trans_presets.java:489
-#, fuzzy
 msgid "Wheelchairs"
-msgstr "Αναπηρικό καρότσι"
+msgstr ""
 
 #: build/trans_presets.java:490
@@ -18826,7 +19047,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "Επεξεργασία Γέφυρας"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -18839,7 +19059,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "Επεξεργασία ποδηλατόδρομου"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -18874,24 +19093,21 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "Επιβεβαίωση συνδυασμού"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "Επεξεργασία Αυτοκινητοδρόμου"
+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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr ""
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr ""
@@ -18899,5 +19115,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "Σκαλοπάτια"
@@ -18907,5 +19123,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Επεξεργασία σκαλοπατιών"
@@ -18913,10 +19129,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr "Σημεία αναφοράς"
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "Κόμβος Αυτοκινητοδρόμου"
@@ -18924,15 +19140,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "Επεξεργασία Κόμβου Αυτοκινητοδρόμου"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "Αριθμός"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "Υπηρεσίες"
@@ -18940,5 +19156,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr ""
@@ -18946,5 +19162,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -18977,17 +19194,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "Λειτουργός"
@@ -18996,5 +19213,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "Σηματοδότης"
@@ -19004,5 +19221,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr "Τύπος διάβασης πεζών"
@@ -19011,27 +19228,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr "σηματοδότες"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "νησίδα"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr ""
@@ -19039,6 +19256,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr ""
@@ -19047,11 +19264,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -19059,30 +19276,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "Stop"
@@ -19090,5 +19307,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr "Διάβαση Πεζών"
@@ -19097,14 +19314,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr "Επεξεργασία Διάβασης Πεζών"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr "Μικρός Κυκλικός Κόμβος"
@@ -19115,14 +19378,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr "Κατεύθυνση"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr "δεξιόστροφα"
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr ""
@@ -19132,26 +19395,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "Όρια πόλης"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "Επεξεργασία πινακίδας ορίων πόλης"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr "Δεύτερο Όνομα"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "Τηλέφωνο εκτάκτου ανάγκης"
@@ -19159,5 +19424,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr ""
@@ -19165,5 +19430,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr ""
@@ -19171,11 +19436,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr ""
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr ""
@@ -19183,5 +19455,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr ""
@@ -19189,5 +19461,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -19199,7 +19471,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "Υψόμετρο"
@@ -19207,5 +19479,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Εμπόδια"
@@ -19213,5 +19485,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr ""
@@ -19219,5 +19491,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr ""
@@ -19262,16 +19534,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "Επιτρεπόμενα οχήματα:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr ""
@@ -19280,5 +19552,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr ""
@@ -19286,5 +19558,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr ""
@@ -19292,10 +19564,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr ""
@@ -19303,15 +19575,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "Σταθμός Διοδίων"
@@ -19319,5 +19591,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "Επεξεργασία Σταθμού Διοδίων"
@@ -19325,10 +19597,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr "Συνοριακός Σταθμός"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr "Επεξεργασία Συνοριακού Σταθμού"
@@ -19338,5 +19610,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr "Φράκτης θάμνων"
@@ -19345,12 +19617,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:817 build/trans_presets.java:819
 msgid "Fence"
 msgstr "Φράκτης"
 
-#. item "Barriers/Fence"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "Τοίχος"
@@ -19358,5 +19642,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr ""
@@ -19365,5 +19649,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr ""
@@ -19375,15 +19659,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr "Είσοδος"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr "Επεξεργασία Εισόδου"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "Πύλη"
@@ -19391,50 +19676,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr "Επεξεργασία Πύλης"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr ""
@@ -19442,25 +19727,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr ""
@@ -19471,11 +19756,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "Νερό"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "Πηγή"
@@ -19483,5 +19768,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "Επεξεργασία πηγής"
@@ -19489,5 +19774,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr ""
@@ -19495,10 +19780,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "Υδατόρρευμα"
@@ -19506,10 +19802,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "Επεξεργασία Υδατορρεύματος"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "Κανάλι"
@@ -19517,10 +19813,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "Επεξεργασία Καναλιού"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "Ποταμός"
@@ -19530,5 +19826,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "Επεξεργασία ποταμού"
@@ -19536,15 +19832,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Επεξεργασία νερού"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "Ξηρά"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "Επεξεργασία νερού"
@@ -19552,15 +19848,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr "Λεκάνη"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr "Ταμιευτήρας"
@@ -19568,15 +19864,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr "Επεξεργασία Ταμιευτήρα"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr "Καλυμένος Ταμιευτήρας"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr "Επεξεργασία Καλυμένου Ταμιευτήρα"
@@ -19584,5 +19880,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "Όχθη ποταμού"
@@ -19591,10 +19887,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "Επεξεργασία όχθης ποταμού"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr ""
@@ -19605,14 +19901,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "Βάλτος"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr ""
@@ -19626,35 +19922,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr "έλος"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "Λάσπη"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "Παραλία"
@@ -19662,20 +19958,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "Επεξεργασία παραλίας"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "Όρμος"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "Επεξεργασία όρμου"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "Λόφος"
@@ -19683,10 +19979,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "Επεξεργασία λόφου"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "Ακτογραμμή"
@@ -19694,5 +19990,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "Επεξεργασία Ακτογραμμής"
@@ -19700,5 +19996,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr ""
@@ -19706,5 +20002,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr ""
@@ -19713,5 +20009,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr ""
@@ -19719,10 +20015,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr ""
@@ -19730,5 +20026,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr ""
@@ -19736,5 +20032,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "Φράγμα"
@@ -19742,15 +20038,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "Επεξεργασία Φweirράγματος"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr ""
@@ -19759,5 +20055,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr "Φράγμα εκτροπής"
@@ -19765,20 +20061,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr "Επεξεργασία φράγματος εκτροπής"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "Καταρράκτης"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "Επεξεργασία Καταράκτη"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr ""
@@ -19787,15 +20083,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "Αποβάθρα"
@@ -19803,10 +20099,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "Επεξεργασία Αποβάθρας"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr ""
@@ -19814,10 +20110,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr ""
@@ -19827,20 +20123,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "Σιδηρόδρομος"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "Σιδηροτροχιά"
@@ -19848,5 +20144,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr "Επεξεργασία σιδηροτροχιάς"
@@ -19855,139 +20151,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr ""
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr ""
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr ""
+
+#. item "Man Made/Power Line" text "Line reference"
+#. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
+#: build/trans_presets.java:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr ""
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr ""
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr ""
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr ""
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "Υπόγειος Σιδηρόδρομος"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "Επεξεργασία υπογείου σιδηροδρόμου"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "Τραμ"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr "Επεξεργασία Τραμ"
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr ""
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr ""
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr ""
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr ""
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr ""
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr ""
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr ""
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr ""
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr ""
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr ""
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr ""
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr ""
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "Υπόγειος Σιδηρόδρομος"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "Επεξεργασία υπογείου σιδηροδρόμου"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "Τραμ"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr "Επεξεργασία Τραμ"
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr ""
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr ""
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr ""
@@ -19996,5 +20531,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr "Ισόπεδη διάβαση"
@@ -20003,5 +20538,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr "Φυλασόμενη Διάβαση"
@@ -20011,5 +20546,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr "Είδος Διάβασης"
@@ -20017,5 +20552,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "Περιστρεφόμενη πλατφόρμα"
@@ -20024,10 +20559,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr ""
@@ -20035,10 +20577,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr ""
@@ -20046,10 +20588,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr ""
@@ -20057,10 +20599,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr ""
@@ -20068,10 +20610,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20079,12 +20621,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr ""
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "Καύσιμα"
@@ -20094,9 +20649,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Επεξεργασία καυσίμων"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20150,32 +20762,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "Ώρες Λειτουργείας"
@@ -20234,94 +20846,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20333,5 +21021,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20341,5 +21029,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Επεξεργασία Χώρου Στάθμευσης"
@@ -20350,25 +21038,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr "Αριθμός Αναφοράς"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "πολυόροφο"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "επιφάνεια"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr "υπόγειο"
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr ""
@@ -20377,48 +21065,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "Κόστος"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr "Θέσεις αναπήρων"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "Πλυντήριο"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "Επεξεργασία πλυντηρίου"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "Συνεργείο Αυτοκινήτων"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "Επεξεργασία Συνεργείου Αυτοκινήτων"
@@ -20426,5 +21114,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "Ενοικίαση"
@@ -20433,10 +21121,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "Επεξεργασία Ενοικίασης"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr "Κοινή χρήση"
@@ -20444,5 +21132,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr "Επεξεργασία κοινής χρήσης αυτοκινήτου"
@@ -20450,10 +21138,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "Επεξεργασία χώρου στάθμευσης ποδηλάτων"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr "Χωρητικότητα"
@@ -20462,15 +21150,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "Επεξεργασία Ενοικίασης ποδηλάτων"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Μέσα Μαζικής Μεταφοράς"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -20480,5 +21168,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -20486,5 +21174,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr ""
@@ -20492,5 +21180,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr ""
@@ -20498,5 +21186,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr ""
@@ -20504,5 +21192,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "Στάση Τραμ"
@@ -20511,5 +21199,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "Επεξεργασία Στάσης Τραμ"
@@ -20517,5 +21205,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr ""
@@ -20524,5 +21212,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr ""
@@ -20534,5 +21222,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr ""
@@ -20540,10 +21228,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "Είσοδος υπογείου σιδηρόδρομου"
@@ -20552,10 +21240,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "Επεξεργασία εισόδου υπογείου σιδηρόδρομου"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr "Αναπηρικό καρότσι"
@@ -20564,5 +21252,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "Σταθμός Λεωφορείων"
@@ -20571,5 +21259,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "Επεξεργασία Σταθμού Λεωφορείων"
@@ -20577,5 +21265,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "Στάση Λεωφορείου"
@@ -20585,5 +21273,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "Επεξεργασία Στάσης Λεωφορείου"
@@ -20592,25 +21280,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr "Καταφύγιο"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "Παγκάκι"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr ""
@@ -20618,5 +21307,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "Ταξί"
@@ -20624,5 +21313,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "Επεξεργασία σταθμού ταξί"
@@ -20630,32 +21319,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "Αεροδρόμιο"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr "Επεξεργασία Αεροδρομίου"
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr "IATA"
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr "ICAO"
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Διαμονή"
@@ -20667,5 +21451,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Ξενοδοχείο"
@@ -20674,15 +21458,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "Επεξεργασία Ξενοδοχείου"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "Αστέρια"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr ""
@@ -20690,20 +21474,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr "Ξενώνας"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr "Επεξεργασία Ξενώνα"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "Σαλέ"
@@ -20711,10 +21495,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr "Επεξεργασία Σαλέ"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr ""
@@ -20722,30 +21506,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr "Χώρος Τροχόσπιτων"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr "Επεξεργασία Χώρου Τροχόσπιτων"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "Χώρος Κάμπινγκ"
@@ -20753,10 +21537,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr "Επεξεργασία Χώρου Κάμπινγκ"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Φαγητό+Ποτά"
@@ -20767,5 +21551,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Εστιατόριο"
@@ -20773,5 +21557,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "Επεξεργασία Εστιατορίου"
@@ -20779,5 +21563,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr "Κουζίνα"
@@ -20785,61 +21569,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "ιταλική"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "κινέζικη"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "ελληνική"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "γερμανική"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "ινδική"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "τοπική"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "τουρκική"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "ασιατική"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "ταϊλανδέζικη"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "μεξικάνικη"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "ιαπωνική"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -20847,9 +21643,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "Επεξεργασία Εστιατορίου Fast Food"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "Καφέ"
@@ -20857,9 +21661,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "Επεξεργασία Καφέ"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "Pub"
@@ -20867,18 +21671,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "Επεξεργασία Pub"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr "Μπαρ"
@@ -20886,9 +21690,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr "Επεξεργασία Μπαρ"
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "Νυχτερινό Κέντρο"
@@ -20896,24 +21700,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "Νυχτερινό Κέντρο"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Τουρισμός"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Μουσείο"
@@ -20921,9 +21725,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Επεξεργασία Μουσείου"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Ζωολογικός Κήπος"
@@ -20932,9 +21736,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Επεξεργασία Ζωολογικού Κήπου"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr ""
@@ -20942,24 +21746,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr "Πύργος Παρατήρησης"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "Θεματικό Πάρκο"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr "Επεξεργασία Θεματικού Πάρκου"
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr ""
@@ -20967,5 +21771,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr ""
@@ -20973,19 +21777,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr "Γραφείο Πληροφοριών"
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Χάρτης"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr ""
@@ -21023,5 +21827,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -21029,28 +21833,28 @@
 msgstr "οδός"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr ""
@@ -21060,5 +21864,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr ""
@@ -21066,5 +21870,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr "Πεζοπορία"
@@ -21072,6 +21876,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "Ποδηλασία"
@@ -21079,5 +21883,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr ""
@@ -21085,6 +21889,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr ""
@@ -21092,5 +21896,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr ""
@@ -21098,46 +21902,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "ιστορία"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr ""
@@ -21145,29 +21949,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr ""
@@ -21175,25 +21979,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr "Τζάκι"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Ιστορικά Σημεία"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Κάστρο"
@@ -21202,19 +22006,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Επεξεργασία Κάστρου"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Ερείπια"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Επεξεργασία Ερειπίων"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Αρχαιολογικός Χώρος"
@@ -21223,9 +22027,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "Επεξεργασία Αρχαιολογικού Χώρου"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "Πεδίο Μάχης"
@@ -21233,10 +22037,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "Επεξεργασία Πεδίου Μάχης"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr ""
@@ -21244,5 +22048,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -21250,15 +22054,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "Μνημείο"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "Επεξεργασία Μνημείου"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "Ηρώο"
@@ -21266,55 +22070,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "Επεξεργασία Ηρώου"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Αναψυχή"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Παιδική Χαρά"
@@ -21322,35 +22126,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Επεξεργασία Παιδικής Χαράς"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Ψάρεμα"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "Επεξεργασία Ψαρέματος"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr "Αθλητικά"
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr "Χώροι Άθλησης"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Στάδιο"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Επεξεργασία Σταδίου"
@@ -21364,6 +22168,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "επιλέξτε άθλημα:"
@@ -21755,6 +22559,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -21788,225 +22592,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "τοξοβολία"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "Καλαθοσφαίρηση"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr "Κανόε"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "αναρρήχηση"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "ποδηλασία"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr "κυνοδρομίες"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "ποδόσφαιρο"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "σκοποβολή"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "ποδόσφαιρο"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "κολύμβηση"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "επιτραπέζια αντισφαίρηση"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "αντισφαίρηση"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "Αθλητικό Κέντρο"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "Επεξεργασία Αθλητικού Κέντρου"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "Μίνι Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "Επεξεργασία Μίνι Golf"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Άθλημα"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr "Πολλαπλά"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr ""
@@ -22045,21 +22849,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "τύπος"
@@ -22098,203 +22902,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "αθλητικό κέντρο"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "στάδιο"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "Τοξοβολία"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "Επεξεργασία τοξοβολίας"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "Αναρρήχηση"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "Επεξεργασία Αναρρήχησης"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr "Επεξεργασία Ποδηλασίας"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "Κυνοδρομίες"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr "Επεξεργασία Κυνοδρομιών"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr "Ιππικό"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr "Επεξεργασία Ιππικού"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "Μηχανοκίνητα Αθλήματα"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr "Επεξεργασία Μηχανοικίνητων  Αθλημάτων"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "Κολύμβηση"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "Επεξεργασία Κολύμβησης"
@@ -22302,56 +23106,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr "Δυσκολία"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr "αρχαρίων"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr "εύκολη"
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr ""
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "Σκοποβολή"
@@ -22359,182 +23159,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "Επεξεργασία Σκοποβολής"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "Ποδόσφαιρο"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr "Επεξεργασία Ποδοσφαίρου"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "Ποδόσφαιρο"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr "Επεξεργασία Baseball"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "Καλαθοσφαίρηση"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "Επεξεργασία Καλαθοσφαίρησης"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr "Επεξεργασία Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "Επεξεργασία Hockey"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr "Επεξεργασία Rugby"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "Επιτραπέζια Αντισφαίριση"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "Επεξεργασία Επιτραπέζιας Αντισφαίρισης"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "Αντισφαίριση"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "Επεξεργασία Αντισφαίρισης"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Κτήρια"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "Κτήριο"
@@ -22542,5 +23342,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Δημόσιο Κτήριο"
@@ -22548,10 +23348,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Επεξεργασία Δημοσίου Κτηρίου"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "Δημαρχείο"
@@ -22559,10 +23359,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Επεξεργασία Δημαρχείου"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Πρεσβεία"
@@ -22570,10 +23370,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Επεξεργασία Πρεσβείας"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "Δικαστήρια"
@@ -22582,10 +23382,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Επεξεργασία Δικαστηρίων"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Φυλακή"
@@ -22594,10 +23394,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Επεξεργασία Φυλακής"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Αστυνομία"
@@ -22607,10 +23407,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Επεξεργασία Αστυνομίας"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "Πυροσβεστείο"
@@ -22619,10 +23419,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Επεξεργασία Πυροσβεστείου"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Ταχυδρομείο"
@@ -22630,5 +23430,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Επεξεργασία Ταχυδρομείου"
@@ -22636,15 +23436,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "Νηπιαγωγίο"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "Επεξεργασία Νηπιαγωγίου"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "Σχολείο"
@@ -22652,10 +23452,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "Επεξεργασία Σχολείου"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "Πανεπιστήμιο"
@@ -22663,10 +23463,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "Επεξεργασία Πανεπιστημίου"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "Κολέγιο"
@@ -22674,5 +23474,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "Επεξεργασία Κολεγίου"
@@ -22680,5 +23480,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Κινηματογράφος"
@@ -22687,10 +23487,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Επεξεργασία Κινηματογράφου"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "Βιβλιοθήκη"
@@ -22699,9 +23499,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Επεξεργασία Βιβλιοθήκης"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "Κέντρο Τεχνών"
@@ -22709,10 +23509,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "Επεξεργασία Κέντρου Τεχνών"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Θέατρο"
@@ -22721,10 +23521,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Επεξεργασία Θεάτρου"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "Τόπος Λατρείας"
@@ -22734,5 +23534,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "Επεξεργασία Τόπου Λατρείας"
@@ -22741,6 +23541,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "Θρησκεία"
@@ -22749,66 +23549,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "βουδισμός"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "χριστιανισμός"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "ινδουϊσμός"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "ιουδαϊσμός"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "μουσουλμανισμός"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr "ταοϊσμός"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr "Δόγμα"
@@ -22817,81 +23617,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr "αγγλικανικό"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "βαπτιστικό"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "καθολικό"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr "ευαγγελικό"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr "μαρτύρων του Ιεχοβά"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "λουθερανικό"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "ορθόδοξο"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr "πεντηκωστής"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "προτεσταντικό"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Διευθύνσεις"
@@ -22900,5 +23700,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Επεξεργασία διεύθυνσης"
@@ -22906,5 +23706,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "Αριθμός σπιτιού"
@@ -22912,25 +23712,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "Όνομα Σπιτιού"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Όνομα οδού"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "Όνομα πόλης"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Ταχυδρομικός Κώδικας"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "Κωδικός χώρας"
@@ -22939,5 +23739,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "Επεξεργασία Παρεμβολής Διευθύνσεων"
@@ -22945,61 +23745,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr "Τρόπος Αρίθμησης"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "Μονά"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "Ζυγά"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Πύργος"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Επεξεργασία Πύργου"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr ""
@@ -23007,25 +23807,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Υδραγωγείο"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Επεξεργασία Υδραγωγείου"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "Μετρητής Αερίου"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "Επεξεργασία Μετρητή Αερίου"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "Φάρος"
@@ -23033,10 +23833,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Επεξεργασία Φάρου"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Ανεμόμυλος"
@@ -23044,10 +23844,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Επεξεργασία Ανεμόμυλου"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Αγωγός"
@@ -23056,37 +23856,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Επεξεργασία Αγωγού"
 
-#: build/trans_presets.java:2198
-msgid "oil"
-msgstr ""
-
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
 msgid "gas"
 msgstr "Αέριο"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr ""
+
+#: build/trans_presets.java:2353
+msgid "oil"
+msgstr ""
+
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "Βιολογικός Καθαρισμός"
@@ -23096,10 +23896,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "Επεξεργασία Βιολογικού Καθαρισμού"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Γερανός"
@@ -23107,21 +23907,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Επεξεργασία Γερανού"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr "Φάρος"
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr "Επεξεργασία Φάρου"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr ""
@@ -23129,10 +23924,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "Παρακολούθηση"
@@ -23140,11 +23935,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Επεξεργασία Κάμερας Παρακολούθησης"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "Γεννήτρια Ρεύματος"
@@ -23154,35 +23961,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "Επεξεργασία Γεννήτριας Ρεύματος"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "Αέρας"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "Νερό"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "Πυρηνικό"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "Λιγνίτης"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr "Φωτοβολταϊκό"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "Σταθμός Παραγωγής Ρεύματος"
@@ -23191,10 +23998,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "Επεξεργασία Σταθμού Παραγωγής Ρεύματος"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "Υποσταθμός Ρεύματος"
@@ -23203,5 +24010,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "Επεξεργασία Υποσταθμού Ρεύματος"
@@ -23209,10 +24016,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "Πυλώνας Ρεύματος"
@@ -23223,23 +24030,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "Επεξεργασία Πυλώνα Ρεύματος"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "Αγωγός Μεταφοράς Ρεύματος"
@@ -23248,79 +24055,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "Επεξεργασία Αγωγού Μεταφοράς Ρεύματος"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr ""
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "Τάση ρεύματος"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Τουαλέτες"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr "Σημείωση"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "Γραμματοκιβώτιο"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Τηλέφωνο"
@@ -23329,5 +24131,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Επεξεργασία Τηλεφώνου"
@@ -23335,5 +24137,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Κέρματα"
@@ -23341,5 +24143,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "Χαρτονομίσματα"
@@ -23347,5 +24149,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -23353,5 +24155,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr "Χρεωστικές Κάρτεσ"
@@ -23359,15 +24161,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Πιστωτικές Κάρτες"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Τηλεκάρτες"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Ανακύκλωση"
@@ -23376,5 +24178,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Επεξεργασία σταθμού Ανακύκλωσης"
@@ -23382,63 +24184,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "Μπαταρίες"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "Τενεκεδάκια"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "Ρούχα"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "Γυαλί"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "Χαρτί"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "Μέταλλα"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+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:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr ""
@@ -23517,5 +24330,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -23525,31 +24338,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -23558,30 +24371,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "Ύψος"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr "χαμηλό"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr "μισό"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr "πλήρες"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr "Κρυψώνα"
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr "Κλειδαριά"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "Συντριβάνι"
@@ -23590,10 +24403,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "Επεξεργασία Συντριβανίου"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "Πόσιμο Νερό"
@@ -23602,10 +24415,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Επεξεργασία πόσιμου νερού"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr "Βρεφοδόχος"
@@ -23613,15 +24439,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr "Επεξεργασία Βρεφοδόχου"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Καταστήματα"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr ""
@@ -23629,10 +24455,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "Επεξεργασία Καταστήματος"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr ""
@@ -23641,28 +24467,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "Επεξεργασία Καταστήματος Ποδηλάτων"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "Επεξεργασία Supermarket"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr ""
@@ -23670,9 +24496,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "Περίπτερο"
@@ -23680,27 +24506,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "Επεξεργασία Περιπτέρου"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "Μηχάνημα Πώλησης"
@@ -23708,5 +24534,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "Επεξεργασία Μηχανήματος Πώλησης"
@@ -23714,88 +24540,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "Πωλούμενα Προϊόντα"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr "εισητήρια Μέσων Μαζικής Μεταφοράς"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr "χάρτες Μέσων Μαζικής Μεταφοράς"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr "εισιτήρια Στάθμευσης"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "φαγητό"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "ποτά"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "γλυκά"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "τσιγάρα"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "φωτογραφίες"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "τροφές ζώων"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "εφημερίδες"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "Παιχνίδια"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "Γραμματόσημα"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "Κάρτες SIM"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr "κουπόνια"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "Προφυλακτικά"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "Κρεοπωλείο"
@@ -23803,9 +24629,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Επεξεργασία Κρεοπωλείου"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "Φούρνος"
@@ -23813,9 +24639,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Επεξεργασία Φούρνου"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "Ανθοπωλείο"
@@ -23823,18 +24649,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "Επεξεργασία Ανθοπωλείου"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr "Βιολογικά"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr "Επεξεργασία Καταστήματος Βιολογικών"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr ""
@@ -23842,54 +24668,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr "Υπολογιστές"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "Επεξεργασία Καταστήματος Υπολογιστών"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr "Ηλεκτρονικά"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "Επεξεργασία Καταστήματος Ηλεκτρονικών"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr "Ηχοσυστήματα"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr "Επεξεργασία Καταστήματος Ηχοσυστημάτων"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr "Έπιπλα"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "Επεξεργασία Καταστήματος Επίπλων"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr "Είδη Κήπου"
@@ -23897,9 +24723,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr "Επεξεργασία Καταστήματος Ειδών Κήπου"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr "Σιδηρικά"
@@ -23907,9 +24733,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr "Επεξεργασία Καταστήματος Σιδηρικών"
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -23917,54 +24743,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr "Χαρτικά"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr "Επεξεργασία Χαρτοπωλείου"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "Κομμωτήριο"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "Επεξεργασία Κομμωτηρίου"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr "Υποδήματα"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "Επεξεργασία Υποδηματοπωλείου"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr "Παιχνίδια"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "Επεξεργασία Καταστήματος Παιχνιδιών"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Στπγνοκαθαριστήριο"
@@ -23972,9 +24798,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Επεξεργασία Στεγνοκαθαριστηρίου"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Πλυντήριο"
@@ -23982,9 +24808,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Επεξεργασία πλυντηρίου"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr ""
@@ -23992,28 +24818,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr "Επεξεργασία Καταστήματος Αθλητικών"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Μετρητά"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Τράπεζα"
@@ -24021,14 +24847,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Επεξεργασία Τράπεζας"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "ΑΤΜ"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Συναλλακτήριο"
@@ -24036,5 +24862,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Επεξεργασία Συναλλακτηρίου"
@@ -24042,15 +24868,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Επεξεργασία ΑΤΜ"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Υγεία"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "Ιατροί"
@@ -24058,18 +24884,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "Επεξεργασία Ιατρών"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "Οδοντίατρος"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "Επεξεργασία Οδοντιάτρου"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Φαρμακείο"
@@ -24077,5 +24903,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Επεξεργασία Φαρμακείου"
@@ -24083,9 +24909,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Νοσοκομείο"
@@ -24093,10 +24919,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Επεξεργασία Νοσοκομειου"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr ""
@@ -24105,5 +24931,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -24112,20 +24938,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr "Αριθμός Σημείου"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr "Όνομα Σημείου"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "Αριθμός Τηλεφώνου"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Χρησιμοποιήστε διεθνή κωδικό, όπως +12-345-67890)"
@@ -24133,5 +24959,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "Κτηνιατρίο"
@@ -24140,64 +24966,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "Επεξεργασία Κτηνιατρίου"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Τοποθεσίες"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Ήπειρος"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Επεξεργασία Ηπείρου"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "Χώρα"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Επεξεργασία Χώρας"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "Πολιτεία"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "Επεξεργασία Πολιτείας"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "Περιοχή"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "Επεξεργασία Περιοχής"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr "Περιφέρεια"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr "Επεξεργασία Περιφέρειας"
@@ -24205,15 +25031,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "Πόλη"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "Επεξεργασία Πόλης"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "Κωμόπολη"
@@ -24221,10 +25047,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "Επεξεργασία Κωμόπολης"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "Προάστιο"
@@ -24232,25 +25058,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "Επεξεργασία Προαστίου"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Χωριό"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Επεξεργασία Χωριού"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr ""
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr ""
@@ -24258,5 +25084,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr ""
@@ -24264,10 +25090,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "Νησί"
@@ -24275,10 +25101,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Επεξεργασία Νησιού"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr ""
@@ -24286,5 +25112,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr ""
@@ -24292,5 +25118,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "Είσοδος σπηλαίου"
@@ -24298,10 +25124,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "Επεξεργασία εισόδου σπηλαίου"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Κορυφή"
@@ -24309,10 +25135,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Επεξεργασία κορυφής"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "Παγετώνας"
@@ -24320,10 +25146,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "Επεξεργασία παγετώνα"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "Ηφαίστειο"
@@ -24331,70 +25157,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "Επεξεργασία ηφαιστείου"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Όρια"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "Εθνικό"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "Επεξεργασία Εθνικού Συνόρου"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "Διοικητικό"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "Επεξεργασία Διοικητικού Ορίου"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr "Πολιτικό"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr "Επεξεργασία Πολιτικού Ορίου"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr "Πολιτικό"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "Επεξεργασία Πολιτικού Ορίου"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr "Εθνικό πάρκο"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "Επεξεργασία Ορίου Εθνικού Δρυμού"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Χρήση γής"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Δένδρο"
@@ -24403,15 +25229,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Επεξεργασία δένδρου"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "Βοτανικό όνομα"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "Άλσος"
@@ -24420,5 +25246,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "Επεξεργασία άλσους"
@@ -24426,17 +25252,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "Κωνοφόρο"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "φυλλοβόλα"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "Μικτό"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "Δάσος"
@@ -24445,14 +25271,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "Επεξεργασία Δάσους"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr ""
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -24460,25 +25286,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr ""
@@ -24486,10 +25312,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr ""
@@ -24497,5 +25323,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr ""
@@ -24503,5 +25329,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr ""
@@ -24510,45 +25336,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "Χωράφι"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr "Επεξεργασία Χωραφιού"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "Αμπελώνας"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "Επεξεργασία Αμπελώνα"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr "Κλήροι"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -24556,25 +25382,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "Κήπος"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "Επεξεργασία Κήπου"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "Γρασίδι"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr ""
@@ -24582,10 +25408,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr ""
@@ -24593,20 +25419,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "Πάρκο"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "Επεξεργασία Πάρκου"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr "Χώρος αναψυχής"
@@ -24614,5 +25440,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr "Επεξεργασία χώρου αναψυχής"
@@ -24620,15 +25446,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "Οικιστική περιοχή"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr "Επεξεργασία οικιστικής περιοχής"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "Νεκροταφείο"
@@ -24636,9 +25462,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Επεξεργασία Νεκροταφείου"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "Κοιμητήριο"
@@ -24646,39 +25472,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "Επεξεργασία χρήσης γης κοιμητηρίου"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "Βιομηχανική"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr ""
@@ -24686,15 +25512,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "Στρατιωτικά"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr ""
@@ -24702,50 +25528,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "Εγοτάξιο"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "Επεξεργασία εργοταξίου"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr "ΧΥΤΑ"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr "Επεξεργασία Χρήσης γης ΧΥΤΑ"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "Λατομείο"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "Επεξεργασία Λατομείου"
@@ -24755,5 +25581,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr ""
@@ -24762,10 +25588,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr ""
@@ -24773,5 +25599,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr "Περιορισμός στροφής"
@@ -24780,5 +25606,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr "Επεξεργασία περιορισμού στροφής"
@@ -24786,34 +25612,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr "Περιορισμός"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr "όχι_αριστερή_στροφή"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr "όχι_δεξιά_στροφή"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr "όχι_ευθεία"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr "όχι_αναστροφή"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr "μόνο_δεξιά_στροφή"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr "μόνο_αριστερή_στροφή"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr "μόνο_ευθεία"
@@ -24822,15 +25648,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr ""
@@ -24838,5 +25664,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr "Διαδρομή"
@@ -24845,5 +25671,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr "Επεξεργασία Διαδρομής"
@@ -24851,5 +25677,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr "Τύπος Διαδρομής"
@@ -24940,5 +25766,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -24948,17 +25774,17 @@
 msgstr "ποδήλατο"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr "λεωφορείο"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr "δρόμος"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr "σκι"
@@ -25018,5 +25844,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -25025,9 +25851,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr "τραμ"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr "παράκαμψη"
@@ -25041,10 +25867,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "υπόγειος"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr "Περιγραφή συμβόλου"
@@ -25052,31 +25878,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr "Δίκτυο"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr "προτεινόμενο"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr "εναλλακτικό"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr "προσωρινό"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr "σύνδεση"
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr "Χρώμα (δεκαεξαδικό)"
@@ -25085,106 +25911,31 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr "τμήμα διαδρομής"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 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 ""
 
@@ -25720,77 +26471,4 @@
 #: build/trans_style.java:975 build/trans_style.java:983
 msgid "highway_track"
-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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
 msgstr ""
 
@@ -26179,7 +26857,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "βαπτιστικό"
+msgstr ""
 
 #. color manmade
@@ -29318,24 +29995,4 @@
 msgstr ""
 
-#~ msgid "Cycleway"
-#~ msgstr "Ποδηλατόδρομος"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Επεξεργασία Πεζοπορίας"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Επεξεργασία Ορειβασίας"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Επεξεργασία απαιτητικής ορειβασίας"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "εικόνα"
-#~ msgstr[1] "εικόνες"
-
 #~ msgid "Do not show again"
 #~ msgstr "Να μην εμφανιστεί ξανά"
@@ -29377,4 +30034,7 @@
 #~ msgid "Shop"
 #~ msgstr "Κατάστημα"
+
+#~ msgid "Cycleway"
+#~ msgstr "Ποδηλατόδρομος"
 
 #~ msgid "All images"
@@ -29504,4 +30164,9 @@
 #~ msgid "Read GPX..."
 #~ msgstr "Ανάγνωση GPX..."
+
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "εικόνα"
+#~ msgstr[1] "εικόνες"
 
 #~ msgid "Image"
@@ -29575,7 +30240,4 @@
 #~ msgstr "Επίπεδο δεδομένων"
 
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Η ώρα ποθ εισήχθει δεν μπόρεσε να ερμηνευθεί."
-
 #~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 #~ msgstr "Εισάγετε την εμφνιζόμενη ημερομηνία (μμ/ηη/εεεε ΩΩ:ΛΛ:ΔΔ)"
@@ -29812,6 +30474,6 @@
 #~ msgstr "YAHOO (WebKit GTK)"
 
-#~ msgid "Station"
-#~ msgstr "Σταθμός"
+#~ msgid "Boat"
+#~ msgstr "Καράβι"
 
 #~ msgid "hikingmap"
@@ -29934,7 +30596,4 @@
 #~ msgstr "Διαγραφή και Λήψη"
 
-#~ msgid "Public"
-#~ msgstr "Δημόσιο"
-
 #~ msgid "Images with no exif position"
 #~ msgstr "Εικόνες χωρίς θέση exif"
@@ -29971,4 +30630,13 @@
 #~ msgid "Edit Information Office"
 #~ msgstr "Επεξεργασία Γραφείου Πληροφοριών"
+
+#~ msgid "Edit Demanding Mountain Hiking"
+#~ msgstr "Επεξεργασία απαιτητικής ορειβασίας"
+
+#~ msgid "Edit Hiking"
+#~ msgstr "Επεξεργασία Πεζοπορίας"
+
+#~ msgid "Edit Mountain Hiking"
+#~ msgstr "Επεξεργασία Ορειβασίας"
 
 #~ msgid "Help / About"
@@ -30017,4 +30685,7 @@
 #~ msgstr "σχέσεις"
 
+#~ msgid ">"
+#~ msgstr ">"
+
 #~ msgid "Apply partial resolutions"
 #~ msgstr "Εφαρμογή μερικών επιλύσεων"
@@ -30043,7 +30714,4 @@
 #~ msgid "Open User Page in browser"
 #~ msgstr "Άνοιγμα Σελίδας Χρήστη στον φυλλομετρητή"
-
-#~ msgid "Interpolation"
-#~ msgstr "Παρεμβολή"
 
 #~ msgid "Optional"
Index: applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- applications/editors/josm/i18n/po/en_GB.po	(revision 19689)
+++ applications/editors/josm/i18n/po/en_GB.po	(revision 19698)
@@ -11,7 +11,7 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-19 00:01-0500\n"
-"PO-Revision-Date: 2010-01-18 23:35-0500\n"
-"Last-Translator: Matthias Julius <mdeb@julius-net.net>\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-31 08:02+0000\n"
+"Last-Translator: Michael Keppler <Bananeweizen@gmx.de>\n"
 "Language-Team: German <josm-dev@openstreetmap.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-13 18:29+0000\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:37+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
 
 #. FIXME why is help not a JosmAction?
@@ -73,11 +73,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -244,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -256,13 +256,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -271,5 +271,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -295,5 +298,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Merge"
@@ -324,5 +327,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -389,9 +392,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -399,5 +402,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "OK"
@@ -448,6 +453,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -465,5 +470,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -472,11 +477,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -513,5 +518,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "conflict"
@@ -646,14 +651,14 @@
 msgstr "Please select at least two ways to combine."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Copy"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Copy selected objects to paste buffer."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Please select something to copy."
@@ -686,8 +691,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -696,5 +701,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -780,4 +785,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -787,4 +794,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplicate selection by copy and immediate paste."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Duplicate Way"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "Edit the currently selected relation"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "Layer: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "Zoom to {0}"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr ""
 
 #. <button label="Info" hotkey="I">
@@ -998,5 +1033,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "URL"
@@ -1147,5 +1182,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+#, fuzzy
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr "<html>Cannot open directory.<br>Please select a file!"
 
@@ -1216,8 +1252,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
-msgid ""
-"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 "
+#, fuzzy
+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.)"
@@ -1236,5 +1273,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "Move nodes so all angles are 90 or 270 degree"
 
@@ -1276,4 +1314,9 @@
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
 
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+#, fuzzy
+msgid "Selection must consist only of ways and nodes."
+msgstr "Multipolygon must consist only of closed ways."
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
 msgid "Orthogonalize"
@@ -1288,4 +1331,15 @@
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "Selected Elements cannot be orthogonalised"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr "Please select ways with almost right angles to orthogonalise."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1394,18 +1448,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1430,12 +1484,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Error"
@@ -1570,5 +1625,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1821,5 +1876,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr "Download data"
@@ -2251,6 +2306,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2373,5 +2428,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Search for objects."
@@ -2570,5 +2625,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Search"
@@ -2608,5 +2663,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
@@ -2614,5 +2669,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
@@ -2620,10 +2675,10 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
 msgstr "RX"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2636,9 +2691,9 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr "Key cannot be empty when tag operator is used. Sample use: key=value"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -3331,5 +3386,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3337,5 +3392,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3343,5 +3398,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3349,5 +3404,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3474,19 +3529,19 @@
 msgstr "F"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "A primitive with ID = 0 cannot be invisible."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "ID > 0 expected. Got {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "version > 0 expected. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3497,5 +3552,5 @@
 "{0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3505,5 +3560,5 @@
 "other is not"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3629,6 +3684,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3638,5 +3693,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3647,7 +3702,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3669,5 +3724,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "background"
@@ -3814,6 +3869,6 @@
 msgstr "Do not show again (remembers choice)"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3821,37 +3876,38 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "incomplete"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "highway"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "railway"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "waterway"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "landuse"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3860,10 +3916,10 @@
 msgstr[1] "{0} nodes"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr "public transport"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3872,5 +3928,5 @@
 msgstr[1] "{0} members"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3907,6 +3963,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Conflict"
@@ -3917,8 +3973,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-msgid "Authorization Failed"
-msgstr "Authorisation Failed"
+msgid "Authorisation Failed"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
+#, fuzzy
 msgid "Authentication failed"
 msgstr "Authentication failed"
@@ -4124,5 +4181,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Initialising"
@@ -4163,5 +4219,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4172,5 +4228,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Edit"
@@ -4241,29 +4297,29 @@
 msgstr "scale"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "The geographic longitude at the mouse pointer."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 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:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "The geographic latitude at the mouse pointer."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 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:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 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:106
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 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:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4273,9 +4329,9 @@
 "this list with the mouse.<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(no object)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4509,16 +4565,16 @@
 msgstr "Conflict Resolution"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr "list in role {0} is currently not participating in a compare pair"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "unexpected value of parameter \"index\". Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4730,7 +4786,12 @@
 msgstr "Node"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr "Merged nodes not frozen yet. Cannot build resolution command."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4890,5 +4951,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr "No, abort"
@@ -4939,5 +5000,10 @@
 msgstr "Primitive"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr "Merged nodes not frozen yet. Cannot build resolution command"
@@ -5067,10 +5133,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "none"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "all"
@@ -5150,7 +5216,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -5160,6 +5226,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5357,10 +5423,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5380,18 +5446,18 @@
 msgstr "Command Stack: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr "Resolve conflicts."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Resolve"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr "Open a merge dialogue of all selected items in the list above."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5421,19 +5487,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216
-#, fuzzy, java-format
+#, 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.Click <strong>{0}</strong> to close anyway."
+"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>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions will not be applied unless all differences<br>are "
-"resolved. 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>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:224
@@ -5455,5 +5515,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5462,5 +5522,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5540,43 +5600,48 @@
 msgstr "Display the history of the selected objects."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Layers"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 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:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr "Delete the selected layers."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Show/Hide"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr "Activate"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr "Activate the selected layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr "Merge this layer into another layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Duplicate Way"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 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:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Move the selected layer one row down."
@@ -5590,6 +5655,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Relations"
@@ -5599,69 +5664,69 @@
 msgstr "Open a list of all relations."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relations: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Open an editor for the selected relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Delete the selected relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Create a new relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Create a copy of this relation and open it in another editor window"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr "Set the current selection to the list of selected relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr "Select the members of all selected relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr "Select members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr "Download all members of the selected relations"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr "Download members"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Current Selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Open a selection list window."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Zoom to selected element(s)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Zoom to selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5669,5 +5734,5 @@
 msgstr "Selection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -6029,8 +6094,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -6102,4 +6165,7 @@
 #. <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 />
@@ -6178,6 +6244,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6219,6 +6286,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6687,152 +6756,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Name"
@@ -7248,5 +7319,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<different>"
@@ -7301,55 +7372,55 @@
 msgstr "Add Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Properties: {0} / Memberships: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Properties / Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Change relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "Delete from relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Really delete selection from relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Delete the selected key in all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "Delete Properties"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Add a new key/value pair to all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Edit the value of the selected key for all objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr "Select relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr "Select relation in main selection."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr "Select in relation list"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr "Select relation in relation list."
@@ -7818,30 +7889,30 @@
 msgstr "way is not connected to previous or next relation member"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Bookmarks"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr "<html>There is currently no download area selected.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+#, fuzzy
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
 "<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
 "maxlon): {0}, {1}, {2}, {3}</html>"
-msgstr ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr "Create bookmark"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:185
 msgid "Add a bookmark for the currently selected download area"
 msgstr "Add a bookmark for the currently selected download area"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:192
 msgid ""
 "Currently, there is no download area selected. Please select an area first."
@@ -7849,19 +7920,19 @@
 "Currently, there is no download area selected. Please select an area first."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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 "Please enter a name for the bookmarked download area."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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 "Name of location"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:217
 msgid "Remove the currently selected bookmarks"
 msgstr "Remove the currently selected bookmarks"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr "Rename the currently selected bookmark"
@@ -7988,18 +8059,18 @@
 "<br>Please chose to either download OSM data, or GPX data, or both.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr "Class Type"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr "Bounds"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr "Near"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -8010,34 +8081,34 @@
 msgstr "Choose the server for searching:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
 msgid "Enter a place name to search for:"
 msgstr "Enter a place name to search for:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:112
 msgid "Enter a place name to search for"
 msgstr "Enter a place name to search for"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:148
 msgid "Areas around places"
 msgstr "Areas around places"
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Null pointer exception, possibly some missing tags."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr "Search ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr "Click to start searching for places"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr "Querying name server"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr "Querying name server ..."
@@ -8048,7 +8119,9 @@
 #. 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" />
@@ -8057,10 +8130,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Type"
@@ -8069,5 +8143,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -8079,17 +8153,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "unknown"
@@ -8466,5 +8539,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:176
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr "Conflicts detected"
@@ -8954,9 +9027,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8966,7 +9039,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -8978,16 +9051,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "Layer"
@@ -9437,68 +9510,68 @@
 msgstr[1] "{0} objects to delete:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "gps point"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Customise line drawing"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../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:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Customise Colour"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Default"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Choose a colour"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr "Markers From Named Points"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Named Trackpoints from {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Import Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9511,23 +9584,23 @@
 "them with audio data.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr "Import not possible"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audio files (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Audio markers from {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Import images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9540,5 +9613,5 @@
 "them with images.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9546,5 +9619,5 @@
 msgstr "Name: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9552,5 +9625,5 @@
 msgstr "Description: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9560,23 +9633,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "Description"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr "Timespan"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr "Length"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Length: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9585,5 +9658,5 @@
 msgstr[1] "{0} routes, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9592,10 +9665,10 @@
 msgstr[1] "{0} waypoints"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Convert to data layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9605,43 +9678,43 @@
 "<br>If you want to upload traces, look here:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Converted from: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "Download from OSM along this track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Download everything within:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metres"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "Maximum area per request:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} sq km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9652,9 +9725,9 @@
 "wish<br>to continue?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 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:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9664,5 +9737,5 @@
 "the end were omitted or moved to the start."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9672,23 +9745,23 @@
 "time were omitted."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Data Layer {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "outside downloaded area"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr "version {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 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:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9697,5 +9770,5 @@
 msgstr[1] "There were {0} conflicts detected."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9714,5 +9787,5 @@
 "server."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9729,11 +9802,11 @@
 "Dialog and manually resolve them."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr "Click to close this dialog and continue editing"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9742,32 +9815,32 @@
 msgstr[1] "{0} deleted"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} consists of:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr "unset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr "API version: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Convert to GPX layer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr "Dataset consistency test"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr "No problems found"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr "Following problems found:"
@@ -9819,24 +9892,24 @@
 msgstr "GPS point"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX Files (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, 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:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Error while parsing {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Could not read \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9848,34 +9921,34 @@
 "on the photo and select a timezone<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr "Photo time (from exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 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:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr "I am in the timezone of: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "No date"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr "Open another photo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 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:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9885,21 +9958,21 @@
 "Please use the requested format"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "Invalid date"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr "<No GPX track loaded yet>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr "GPX track: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr "Open another GPX trace"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
@@ -9907,43 +9980,43 @@
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr "Manual adjust"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr "Override position for: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, 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:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, 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:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr "Show Thumbnail images on the map"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr "Timezone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr "Offset:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr "No gpx selected"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9953,45 +10026,45 @@
 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:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr "Correlate images with GPX track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr "Correlate"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr "Invalid timezone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr "Invalid offset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr "Try Again"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr "No images could be matched!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Timezone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutes: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Seconds: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10000,5 +10073,5 @@
 msgstr[1] "Time difference of {0} days"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10008,21 +10081,21 @@
 "adjust the sliders to manually match the photos."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr "Matching photos to track failed"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr "Adjust timezone and offset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 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:951
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr "Photos do not contain time information"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10032,17 +10105,17 @@
 "one."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr "GPX Track has no time information"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr "You should select a GPX track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr "No selected GPX track"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -10053,5 +10126,5 @@
 "Expected format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -10062,56 +10135,56 @@
 "Expected format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extracting GPS locations from EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr "Starting directory scan"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 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:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "Read photos..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Reading {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, 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:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Scanning directory {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, 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:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, 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:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Geotagged Images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr "Correlate to GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
 #, java-format
 msgid "{0} image loaded."
@@ -10120,5 +10193,5 @@
 msgstr[1] "{0} images loaded."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -10127,10 +10200,10 @@
 msgstr[1] "{0} were found to be GPS tagged."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr "Delete image file from disk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -10141,5 +10214,5 @@
 "permanently lost!</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr "Image file could not be deleted."
@@ -10236,5 +10309,5 @@
 msgstr "gps marker"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10242,5 +10315,5 @@
 msgstr[1] "markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10249,9 +10322,9 @@
 msgstr[1] "{0} consists of {1} markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "Synchronise Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10259,20 +10332,20 @@
 "You need to pause audio at the moment when you hear your synchronisation cue."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr "Audio synchronised at point {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr "Make Audio Marker at Play Head"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -10282,17 +10355,17 @@
 "marker."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 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:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Show/Hide Text/Icons"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 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:171
+#: ../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 "
@@ -10302,5 +10375,5 @@
 "track you were playing (after the first marker)."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -10310,5 +10383,5 @@
 "point where you want to synchronise."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "Unable to create new audio marker."
@@ -10334,5 +10407,5 @@
 msgstr "Illegal dash pattern, at least one value must be > 0"
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
 #, java-format
 msgid ""
@@ -10341,5 +10414,5 @@
 "Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
 #, java-format
 msgid ""
@@ -11010,5 +11083,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Please select the row to edit."
@@ -11022,5 +11095,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -11171,9 +11244,4 @@
 msgstr "Paint style {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "Layer: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -11203,6 +11271,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr "All"
@@ -11241,8 +11309,8 @@
 msgstr "Single Colour (can be customised for named layers)"
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Car"
@@ -11264,13 +11332,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Bicycle"
@@ -11303,12 +11371,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "Foot"
@@ -12333,5 +12401,12 @@
 msgstr "Delete the selection in the tag table"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -12339,18 +12414,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "Optional Attributes:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr "closed way"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Unknown type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -12361,16 +12436,16 @@
 msgstr "Could not read tagging preset source: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Error parsing {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, 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:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -12379,18 +12454,17 @@
 msgstr[1] "Change {0} objects"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "Nothing selected!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "Selection unsuitable!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "Apply Preset"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Change Properties"
@@ -12685,6 +12759,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12711,9 +12785,9 @@
 msgstr "Parsing file \"{0}\" failed"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Parse error: invalid document structure for gpx document"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12736,8 +12810,14 @@
 msgstr "No image files found."
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
 msgstr "Failed to open input stream for resource ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, fuzzy, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "Warning: failed to read MOTD from ''{0}''. Exception was: {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
@@ -12811,5 +12891,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "Coordinates imported: "
@@ -13594,5 +13674,5 @@
 msgstr[1] ""
 "Plugin {0} requires {1} plugins which were not found. The missing plugins "
-"are:\"\n"
+"are:\""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13996,13 +14076,9 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
-"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
-"html>"
-msgstr ""
 "<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 ""
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
@@ -14146,6 +14222,6 @@
 msgstr "Unable to find translation for the locale {0}. Reverting to {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -14156,5 +14232,5 @@
 "was: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -14322,4 +14398,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr "Visibility"
@@ -14410,5 +14487,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "Address Interpolation"
@@ -15027,5 +15104,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr "Location"
@@ -15193,21 +15270,21 @@
 "Remove the area from the relation before splitting it."
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr "TangoGPS Files (*.log)"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr "Format errors: "
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr "TangoGPS import success"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr "TangoGPS import failure!"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr "TCX Files (*.tcx)"
@@ -15239,9 +15316,9 @@
 msgstr "Create duplicate way"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr "Layer for editing GPX tracks"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Convert to GPX layer with anonymised time"
@@ -15256,13 +15333,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr "Import path from GPX layer"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr "Drop existing path"
@@ -15271,6 +15348,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr "No GPX data layer found."
@@ -15499,17 +15576,17 @@
 msgstr "Load set of images as a new layer."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr "Direction index '{0}' not found"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr "The starting location was not within the bbox"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:105
 msgid "Looking for shoreline..."
 msgstr "Looking for shoreline..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -15553,42 +15630,41 @@
 msgstr "Removing duplicate nodes..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr "Lakewalker trace"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr "An unknown error has occurred"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "east"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "northeast"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "north"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "northwest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "west"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "southwest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "south"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "southeast"
@@ -15644,6 +15720,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -15652,73 +15728,73 @@
 msgstr "water"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "coastline"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "land"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Maximum number of segments per way"
 msgstr "Maximum number of segments per way"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
 msgid "Maximum number of nodes in initial trace"
 msgstr "Maximum number of nodes in initial trace"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Maximum grey value to count as water (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
 msgid "Line simplification accuracy (degrees)"
 msgstr "Line simplification accuracy (degrees)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Resolution of Landsat tiles (pixels per degree)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Size of Landsat tiles (pixels)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
 msgid "Shift all traces to east (degrees)"
 msgstr "Shift all traces to east (degrees)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
 msgid "Shift all traces to north (degrees)"
 msgstr "Shift all traces to north (degrees)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
 msgid "Direction to search for land"
 msgstr "Direction to search for land"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
 msgid "Tag ways as"
 msgstr "Tag ways as"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr "WMS Layer"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr "Maximum cache size (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
 msgid "Maximum cache age (days)"
 msgstr "Maximum cache age (days)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:68
 msgid "Source text"
 msgstr "Source text"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr "Maximum number of segments allowed in each generated way. Default 250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -15728,5 +15804,5 @@
 "lines). Default 50000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -15736,5 +15812,5 @@
 "in the range 0-255. Default 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -15744,5 +15820,5 @@
 "<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -15750,53 +15826,53 @@
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Size of one landsat tile, measured in pixels. Default 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Offset all points in East direction (degrees). Default 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Offset all points in North direction (degrees). Default 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Direction to search for land. Default east."
 msgstr "Direction to search for land. Default east."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr "Tag ways as water, coastline, land or nothing. Default is water."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "Which WMS layer to use for tracing against. Default is IR1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "Maximum size of each cache directory in bytes. Default is 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr "Maximum age of each cached file in days. Default is 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr "Data source text. Default is Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "A plugin to trace water bodies on Landsat imagery."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr "Lakewalker Plugin Preferences"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:50
 msgid "Downloading image tile..."
 msgstr "Downloading image tile..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr "Could not acquire image"
@@ -15820,5 +15896,5 @@
 msgstr "Connection Failed"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr "no name"
@@ -15849,5 +15925,5 @@
 msgstr "Course"
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr "LiveGPS layer"
@@ -15921,5 +15997,5 @@
 msgstr "Angle between two selected Nodes"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr "Layer to make measurements"
@@ -16189,4 +16265,76 @@
 msgid "Firefox executable"
 msgstr "Firefox executable"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#, fuzzy
+msgid "Read error!"
+msgstr "Reservoir"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Enter the coordinates for the new node."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Keep backup files"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Error"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "Image file could not be deleted."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Could not rename file ''{0}''"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Keep backup files"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "Keep backup files"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Overwrite"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+#, fuzzy
+msgid "Could not delete temporary file!"
+msgstr "Could not import files."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
@@ -16462,6 +16610,6 @@
 msgstr "Save captured data to file every minute."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -16584,72 +16732,130 @@
 msgstr "You have to specify tagging preset sources in the preferences first."
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+#, fuzzy
+msgid "Terrace a house"
+msgstr "Terrace a building"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+msgid "Interpolation"
+msgstr "Interpolation"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr "Segments"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Streets"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Highest number"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Lowest number"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+#, fuzzy
+msgid "Lowest housenumber of the terraced house"
+msgstr "Lowest housenumber cannot be higher than highest housenumber"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Create a new relation"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Delete duplicate ways"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Street name"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr "Even/Odd"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr "Lowest number"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr "Highest number"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr "Segments"
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr "Lowest housenumber cannot be higher than highest housenumber"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr "Housenumbers do not match odd/even setting"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr "Segment must be a number greater 1"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr "{0} must be greater than 0"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr "{0} is not a number"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr "Reverse a terrace"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr "Reverses house numbers on a terrace."
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr "Reverse a Terrace"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:83
+#, fuzzy
+msgid "Cannot reverse!"
+msgstr "not present"
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:125
 msgid "Reverse Terrace"
 msgstr "Reverse Terrace"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr "Terrace a building"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr "Creates individual buildings from a long building."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr "Select a single, closed way of at least four nodes."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr "Terrace"
@@ -16887,5 +17093,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr "Duplicated nodes"
@@ -16895,5 +17101,5 @@
 msgstr "This test checks that there are no nodes at the very same location."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16905,9 +17111,9 @@
 "be using them.<br>Do you really want to delete?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr "Confirmation"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr "Nodes at same position"
@@ -16944,5 +17150,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -17096,7 +17302,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr "Illegal tag/value combinations"
@@ -17104,80 +17310,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr "Painting problem"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Key ''{0}'' invalid."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr "Tags with empty values"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr "Invalid property key"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr "Invalid white space in property key"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr "Property values start or end with white space"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr "Property values contain HTML entity"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Key ''{0}'' not in presets."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr "Presets do not contain property key"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Value ''{0}'' for key ''{1}'' not in presets."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr "Presets do not contain property value"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr "Check property keys."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Validate that property keys are valid checking against list of words."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr "Use complex property checker."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr "Validate property values and tags using complex rules."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr "TagChecker source"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -17187,86 +17393,86 @@
 "org/index.php/User:JLS/speller) or tag checking data files."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr "Add a new source to the list."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr "Edit the selected source."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "Delete the selected source from the list."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "Data sources"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr "Check property values."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr "Validate that property values are valid checking against presets."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr "Check for FIXMES."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Looks for nodes or ways with FIXME in any property value."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr "Check for paint notes."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr "Check if map painting found data errors."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr "Use default data file."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr "Use the default data file (recommended)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr "Use default tag ignore file."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr "Use the default tag ignore file (recommended)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr "Use default spellcheck file."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Use the default spellcheck file (recommended)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr "Fix properties"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr "Could not find element type"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr "Could not find warning level"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Illegal expression ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -17726,5 +17932,5 @@
 msgstr "WMS layer ({0}), downloading in zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -17739,64 +17945,64 @@
 "tiles anyway?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr "Yes, fetch images"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr "Invalid URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
-msgid ""
-"The requested area is too big. Please zoom in a little, or change resolution"
-msgstr ""
-"The requested area is too big. Please zoom in a little, or change resolution"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
 msgid "Download visible tiles"
 msgstr "Download visible tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+msgid ""
+"The requested area is too big. Please zoom in a little, or change resolution"
+msgstr ""
+"The requested area is too big. Please zoom in a little, or change resolution"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "Change resolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr "Reload erroneous tiles"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "Save WMS layer to file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr "Save WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "Load WMS layer from file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr "Load WMS layer"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, 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:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr "File Format Error"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "Error loading file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr "Set WMS Bookmark"
@@ -18077,6 +18283,13 @@
 "Launches FireFox to display the current visible screen as a nice SVG image."
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -18087,15 +18300,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "The great JGoodies Plastic Look and Feel."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr "Let other applications send commands to JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -18106,10 +18319,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr "Provides routing capabilities."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -18120,15 +18333,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Allow adding markers/nodes on current gps positions."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Provides a dialog for editing tags in a tabular grid."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -18141,10 +18354,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr "Make terraced houses out of single blocks."
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -18155,5 +18368,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -18164,10 +18377,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Easy downloading along a long set of interconnected ways"
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -18275,6 +18488,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -18282,6 +18504,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "Reference"
@@ -18298,5 +18521,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Lanes"
@@ -18318,10 +18541,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Max. speed (km/h)"
@@ -18365,14 +18588,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "Oneway"
@@ -18415,13 +18638,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -18459,13 +18682,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -18500,13 +18723,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "Cutting"
@@ -18541,13 +18764,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "Embankment"
@@ -18679,4 +18902,13 @@
 msgid "Edit Unclassified Road"
 msgstr "Edit Unclassified Road"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr ""
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -18694,15 +18926,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr "Width (metres)"
@@ -18714,5 +18946,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Residential"
@@ -18721,5 +18953,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "Edit Residential Street"
@@ -18737,16 +18969,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Surface"
@@ -18768,166 +19003,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr "paved"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr "unpaved"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr "asphalt"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr "concrete"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr "metal"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "wood"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr "paving_stones"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr "cobblestone"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "gravel"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr "pebblestone"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr "compacted"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr "grass_paver"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "grass"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "sand"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr "ground"
@@ -18935,5 +19177,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr "Living Street"
@@ -18942,5 +19184,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr "Edit Living Street"
@@ -18948,5 +19190,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "Pedestrian"
@@ -18955,5 +19197,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "Edit Pedestrian Street"
@@ -18961,5 +19203,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr "Service"
@@ -18968,5 +19210,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr "Edit Serviceway"
@@ -18976,18 +19218,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr "Serviceway type"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr "alley"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr "driveway"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr "parking_aisle"
@@ -18995,5 +19237,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr "Parking Aisle"
@@ -19003,5 +19245,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr "Edit Parking Aisle"
@@ -19009,5 +19251,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "Road (Unknown Type)"
@@ -19016,5 +19258,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "Edit Road of unknown type"
@@ -19023,20 +19265,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "Road Restrictions"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "Edit Road Restrictions"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "Toll"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "No exit (cul-de-sac)"
@@ -19044,9 +19286,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 msgid "Access"
 msgstr "Access"
 
 #. 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"
@@ -19057,6 +19300,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -19068,4 +19309,5 @@
 #. 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"
@@ -19084,141 +19326,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+msgid "yes"
+msgstr "yes"
+
+#. 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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "private"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+msgstr "designated"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:219
+msgid "destination"
+msgstr "destination"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr "permissive"
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr "agricultural"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-msgid "yes"
-msgstr "yes"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "private"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-msgstr "designated"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "destination"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr "permissive"
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr "agricultural"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "no"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr "Goods"
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Heavy Goods Vehicles (hgv)"
@@ -19233,10 +19483,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr "Horse"
@@ -19252,10 +19502,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "Motorcycle"
@@ -19270,27 +19520,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr "Motorcar"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr "Public Service Vehicles (psv)"
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr "Motorboat"
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "Boat"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Min. speed (km/h)"
@@ -19298,25 +19540,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "Max. weight (tonnes)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr "Max. Height (metres)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr "Max. Width (metres)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr "Max. Length (metres)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "Roundabout"
@@ -19327,5 +19569,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "Edit Junction"
@@ -19345,10 +19587,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "motorway"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr "motorway_link"
@@ -19370,10 +19612,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "trunk"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr "trunk_link"
@@ -19395,10 +19637,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "primary"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr "primary_link"
@@ -19420,5 +19662,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -19433,9 +19675,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "tertiary"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr "unclassified"
@@ -19449,9 +19691,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "residential"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr "living_street"
@@ -19481,10 +19723,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "service"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr "bus_guideway"
@@ -19514,5 +19756,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -19524,10 +19766,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Edit Bridge"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr "Edit Tunnel"
@@ -19535,19 +19777,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Ways"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "Construction"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "Edit Highway Under Construction"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "Junction"
@@ -19563,5 +19805,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "roundabout"
@@ -19569,5 +19811,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr "Track"
@@ -19576,34 +19818,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr "Edit Track"
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "Tracktype"
 msgstr "Tracktype"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade1"
 msgstr "grade1"
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade2"
 msgstr "grade2"
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade3"
 msgstr "grade3"
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade4"
 msgstr "grade4"
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade5"
 msgstr "grade5"
 
-#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr "MTB Scale"
@@ -19611,5 +19853,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr "SAC Scale"
@@ -19617,26 +19859,26 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr "hiking"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
 msgstr "mountain_hiking"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
 msgstr "demanding_mountain_hiking"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
 msgstr "alpine_hiking"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
 msgstr "demanding_alpine_hiking"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
 msgstr "difficult_alpine_hiking"
@@ -19644,5 +19886,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "Path"
@@ -19651,7 +19893,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "Edit Path"
+
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr "intermediate"
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
 
 #: build/trans_presets.java:489
@@ -19722,5 +19985,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr "Dedicated Footway"
@@ -19729,10 +19992,9 @@
 #. <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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Edit Footway"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr "Bikes"
@@ -19740,5 +20002,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "Steps"
@@ -19748,5 +20010,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Edit Flight of Steps"
@@ -19754,10 +20016,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr "Waypoints"
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "Motorway Junction"
@@ -19765,15 +20027,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "Edit Motorway Junction"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "Number"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "Services"
@@ -19781,5 +20043,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr "Edit Service Station"
@@ -19787,5 +20049,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -19818,17 +20081,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "Operator"
@@ -19837,5 +20100,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "Traffic Lights"
@@ -19845,5 +20108,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr "Pedestrian crossing type"
@@ -19852,27 +20115,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr "uncontrolled"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr "traffic_signals"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "island"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr "unmarked"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr "Cross on horseback"
@@ -19880,6 +20143,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr "Cross by bicycle"
@@ -19888,11 +20151,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr "Crossing attendant"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr "Crossing type name (UK)"
@@ -19900,30 +20163,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr "pelican"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "Stop"
@@ -19931,5 +20194,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr "Pedestrian Crossing"
@@ -19938,14 +20201,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr "Edit Crossing"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr "Type name (UK)"
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr "Mini-roundabout"
@@ -19956,14 +20265,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr "Direction"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr "clockwise"
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr "Turning Circle"
@@ -19973,26 +20282,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "City Limit"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "Edit City Limit Sign"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr "Second Name"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 msgid "Speed Camera"
 msgstr "Speed Camera"
 
 #. 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "Emergency Phone"
@@ -20000,5 +20311,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr "Incline"
@@ -20006,5 +20317,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr "Incline Steep"
@@ -20012,11 +20323,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr "Ford"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr "Edit Ford"
@@ -20024,5 +20342,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr "Mountain Pass"
@@ -20030,5 +20348,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr "Edit Mountain Pass"
@@ -20040,7 +20358,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "Elevation"
@@ -20048,5 +20366,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Barriers"
@@ -20054,5 +20372,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr "Bollard"
@@ -20060,5 +20378,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr "Edit Bollard"
@@ -20103,16 +20421,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "Allowed traffic:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr "Cycle Barrier"
@@ -20121,5 +20439,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr "Block"
@@ -20127,5 +20445,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr "Cattle Grid"
@@ -20133,10 +20451,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr "Edit Cattle Grid"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr "Bus Trap"
@@ -20144,15 +20462,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr "Spikes"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr "Edit Spikes"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "Toll Booth"
@@ -20160,5 +20478,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "Edit Toll Booth"
@@ -20166,10 +20484,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr "Border Control point"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr "Edit Border Control point"
@@ -20179,5 +20497,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr "Hedge"
@@ -20186,12 +20504,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:817 build/trans_presets.java:819
 msgid "Fence"
 msgstr "Fence"
 
-#. item "Barriers/Fence"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "Wall"
@@ -20199,5 +20529,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "City Wall"
@@ -20206,5 +20536,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr "Retaining Wall"
@@ -20216,15 +20546,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr "Entrance"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr "Edit an Entrance"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "Gate"
@@ -20232,50 +20563,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr "Edit Gate"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr "Lift Gate"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr "Edit Lift Gate"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr "Hampshire Gate"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr "Edit Hampshire Gate"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr "Bump Gate"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr "Edit Bump Gate"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr "Kissing Gate"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr "Edit Kissing Gate"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr "Stile"
@@ -20283,25 +20614,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr "Edit Stile"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr "Turnstile"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr "Edit Turnstile"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr "Sally Port"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr "Edit Sally Port"
@@ -20312,11 +20643,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "Water"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "Spring"
@@ -20324,5 +20655,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "Edit Spring"
@@ -20330,5 +20661,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr "Drain"
@@ -20336,10 +20667,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr "Edit Drain"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "Stream"
@@ -20347,10 +20689,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "Edit Stream"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "Canal"
@@ -20358,10 +20700,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "Edit Canal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "River"
@@ -20371,5 +20713,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "Edit River"
@@ -20377,15 +20719,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Edit Water"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "Edit Land"
@@ -20393,15 +20735,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr "Basin"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr "Edit Basin Landuse"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr "Reservoir"
@@ -20409,15 +20751,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr "Edit Reservoir Landuse"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr "Covered Reservoir"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr "Edit Covered Reservoir"
@@ -20425,5 +20767,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "Riverbank"
@@ -20432,10 +20774,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "Edit Riverbank"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr "Wetland"
@@ -20446,14 +20788,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr "Edit Wetland"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "swamp"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr "bog"
@@ -20467,35 +20809,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr "marsh"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr "reedbed"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr "saltmarsh"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr "tidalflat"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "Mud"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr "Edit Mud"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "Beach"
@@ -20503,20 +20845,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "Edit Beach"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "Bay"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "Edit Bay"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "Cliff"
@@ -20524,10 +20866,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "Edit Cliff"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "Coastline"
@@ -20535,5 +20877,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "Edit Coastline"
@@ -20541,5 +20883,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "Ferry Route"
@@ -20547,5 +20889,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr "Edit Ferry"
@@ -20554,5 +20896,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr "Boatyard"
@@ -20560,10 +20902,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr "Edit Boatyard"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "Dock"
@@ -20571,5 +20913,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr "Edit Dock"
@@ -20577,5 +20919,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "Dam"
@@ -20583,15 +20925,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "Edit Dam"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr "Waterway Point"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr "Lock Gate"
@@ -20600,5 +20942,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr "Weir"
@@ -20606,20 +20948,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr "Edit Weir"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "Waterfall"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "Edit Waterfall"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr "Turning Point"
@@ -20628,15 +20970,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr "Marina"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr "Edit Marina"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "Pier"
@@ -20644,10 +20986,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "Edit Pier"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr "Ferry Terminal"
@@ -20655,10 +20997,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr "Edit Ferry Terminal"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr "Slipway"
@@ -20668,20 +21010,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr "Edit Slipway"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr "Transport"
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "Railway"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "Railway"
@@ -20689,5 +21031,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr "Edit Railway"
@@ -20696,139 +21038,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr "standard"
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr "yard"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr "siding"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr "spur"
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr "rail"
+
+#. 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:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+msgid "Voltage"
+msgstr "Voltage"
+
+#. 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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr "Narrow Gauge Railway"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr "Edit Narrow Gauge Railway"
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr "Monorail"
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr "Edit Monorail"
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr "Preserved"
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr "Edit Preserved Railway"
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr "Light Rail"
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr "Edit Light Rail"
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "Subway"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "Edit Subway"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "Tram"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr "Edit Tram"
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr "Bus Guideway"
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr "Edit Bus Guideway"
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "Disused Rail"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "Edit Disused Railway"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr "Optional Types"
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr "yard"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr "siding"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr "spur"
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr "Narrow Gauge Railway"
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr "Edit Narrow Gauge Railway"
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr "Monorail"
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr "Edit Monorail"
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr "Preserved"
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr "Edit Preserved Railway"
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr "Light Rail"
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr "Edit Light Rail"
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "Subway"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "Edit Subway"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "Tram"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr "Edit Tram"
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr "Bus Guideway"
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr "Edit Bus Guideway"
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "Disused Rail"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "Edit Disused Railway"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "Abandoned Rail"
@@ -20837,5 +21418,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr "Level Crossing"
@@ -20844,5 +21425,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr "Crossing"
@@ -20852,5 +21433,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr "Crossing type"
@@ -20858,5 +21439,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "Turntable"
@@ -20865,10 +21446,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr "Aerialway"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "Chair Lift"
@@ -20876,10 +21464,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr "Edit Chair Lift"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr "Drag Lift"
@@ -20887,10 +21475,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr "Edit Drag Lift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "Cable Car"
@@ -20898,10 +21486,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "Edit Cable Car"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr "Gondola"
@@ -20909,10 +21497,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr "Edit Gondola"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20920,12 +21508,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr "Edit Station"
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "Fuel"
@@ -20935,9 +21536,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Edit Fuel"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20991,32 +21649,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "Opening Hours"
@@ -21075,94 +21733,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mo-Fr 08:30-20:00"
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -21174,5 +21908,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -21182,5 +21916,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Edit Parking"
@@ -21191,25 +21925,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr "Reference number"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "multi-storey"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "surface"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr "underground"
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr "Park and Ride"
@@ -21218,48 +21952,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "Fee"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr "Capacity (overall)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr "Spaces for Disabled"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr "Spaces for Women"
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr "Spaces for Parents"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "See the Wiki for other capacity:[types]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "Wash"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "Edit Car Wash"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "Repair"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "Edit Car Repair"
@@ -21267,5 +22001,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "Rental"
@@ -21274,10 +22008,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "Edit Car Rental"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr "Sharing"
@@ -21285,5 +22019,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr "Edit Car Sharing"
@@ -21291,10 +22025,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "Edit Bicycle Parking"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr "Capacity"
@@ -21303,15 +22037,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "Edit Bicycle Rental"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Public Transport"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -21321,5 +22055,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -21327,5 +22061,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -21333,5 +22067,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr "Railway Halt"
@@ -21339,5 +22073,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr "Edit Halt"
@@ -21345,5 +22079,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "Tram Stop"
@@ -21352,5 +22086,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "Edit Tram Stop"
@@ -21358,5 +22092,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "Railway Platform"
@@ -21365,5 +22099,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "Edit Railway Platform"
@@ -21375,5 +22109,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr "Reference (track number)"
@@ -21381,10 +22115,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr "Area"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "Subway Entrance"
@@ -21393,10 +22127,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "Edit Subway Entrance"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr "Wheelchair"
@@ -21405,5 +22139,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "Bus Station"
@@ -21412,5 +22146,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "Edit Bus Station"
@@ -21418,5 +22152,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "Bus Stop"
@@ -21426,5 +22160,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "Edit Bus Stop"
@@ -21433,25 +22167,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr "Shelter"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "Bench"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr "Tactile Paving"
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr "Bus Platform"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr "Edit Bus Platform"
@@ -21459,5 +22194,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "Taxi"
@@ -21465,5 +22200,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "Edit Taxi station"
@@ -21471,32 +22206,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "Airport"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr "Edit Airport"
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr "IATA"
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr "ICAO"
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+msgid "Beacon"
+msgstr "Beacon"
+
+#. 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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr "Travel"
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Accomodation"
@@ -21508,5 +22338,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -21515,15 +22345,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "Edit Hotel"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "Stars"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr "Motel"
@@ -21531,20 +22361,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr "Edit Motel"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr "Guest House"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr "Edit Guest House"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "Chalet"
@@ -21552,10 +22382,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr "Edit Chalet"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr "Hostel"
@@ -21563,30 +22393,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr "Edit Hostel"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr "Alpine Hut"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr "Edit Alpine Hut"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr "Caravan Site"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr "Edit Caravan Site"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "Camp Site"
@@ -21594,10 +22424,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr "Edit Camp Site"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Food+Drinks"
@@ -21608,5 +22438,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -21614,5 +22444,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "Edit Restaurant"
@@ -21620,5 +22450,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr "Cuisine"
@@ -21626,61 +22456,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "italian"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "chinese"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "greek"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "german"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "indian"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "turkish"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "asian"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "mexican"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "japanese"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -21688,9 +22530,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "Edit Fast Food Restaurant"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "Cafe"
@@ -21698,9 +22548,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "Edit Cafe"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "Pub"
@@ -21708,18 +22558,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "Edit Pub"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr "Edit Biergarten"
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr "Bar"
@@ -21727,9 +22577,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr "Edit Bar"
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "Nightclub"
@@ -21737,24 +22587,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "Edit Nightclub"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Tourism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr "Edit Attraction"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Museum"
@@ -21762,9 +22612,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Edit Museum"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Zoo"
@@ -21773,9 +22623,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Edit Zoo"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "Viewpoint"
@@ -21783,24 +22633,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "Edit Viewpoint"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "Theme Park"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr "Edit Theme Park"
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "Artwork"
@@ -21808,5 +22658,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "Edit Artwork"
@@ -21814,19 +22664,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr "Information Office"
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Map"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr "Detail Grade"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr "topo"
@@ -21864,5 +22714,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -21870,28 +22720,28 @@
 msgstr "street"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr "scheme"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr "Shown Area"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr "site"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr "city"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr "Closer Description"
@@ -21901,5 +22751,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr "Routes shown for:"
@@ -21907,5 +22757,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr "Hiking"
@@ -21913,6 +22763,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "Cycling"
@@ -21920,5 +22770,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr "Mountainbiking"
@@ -21926,6 +22776,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "Skiing"
@@ -21933,5 +22783,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr "Riding"
@@ -21939,46 +22789,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr "... other transportation modes possible"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr "Information Board"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr "Board Content"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr "notice"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "history"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr "nature"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr "wildlife"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr "plants"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr "Guidepost"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr "Information Terminal"
@@ -21986,29 +22836,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr "Closer description"
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr "Audioguide"
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr "Audioguide via mobile phone?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr "Phone number"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr "Other Information Points"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr "Edit Shelter"
@@ -22016,25 +22866,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr "Fireplace"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "Picnic Site"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "Edit Picnic Site"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Historic Places"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Castle"
@@ -22043,19 +22893,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Edit Castle"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Ruins"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Edit Ruins"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Archaeological Site"
@@ -22064,9 +22914,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "Edit Archaeological Site"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "Battlefield"
@@ -22074,10 +22924,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "Edit Battlefield"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr "Palaeontological Site"
@@ -22085,5 +22935,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr "Edit Palaeontological Site"
@@ -22091,15 +22941,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "Edit Monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "Memorial"
@@ -22107,55 +22957,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "Edit Memorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr "Wayside Cross"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr "Edit Wayside Cross"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr "Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr "Edit Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr "Boundary Stone"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr "Edit Boundary Stone"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Leisure"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "Water Park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "Edit Water Park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Playground"
@@ -22163,35 +23013,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Edit Playground"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Fishing"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "Edit Fishing"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr "Sports"
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr "Sport Facilities"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Stadium"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Edit Stadium"
@@ -22205,6 +23055,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "select sport:"
@@ -22596,6 +23446,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -22629,225 +23479,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "archery"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr "athletics"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr "lawn bowls"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr "canoeing"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "climbing"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr "cricket nets"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "cycling"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr "dog racing"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr "equestrian"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "gymnastics"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr "horse_racing"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "shooting"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr "skating"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "skiing"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "soccer"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "swimming"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "table_tennis"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "Sports Centre"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "Edit Sports Centre"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr "Pitch"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr "Edit Pitch"
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr "Racetrack"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr "Edit Racetrack"
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "Golf Course"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "Edit Golf Course"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "Miniature Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "Edit Miniature Golf"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr "Edit Multi"
@@ -22886,21 +23736,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "type"
@@ -22939,203 +23789,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr "pitch"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "sports_centre"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "stadium"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr "track"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr "10pin"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr "Edit 10pin"
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr "Athletics"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr "Edit Athletics"
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "Archery"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "Edit Archery"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "Climbing"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "Edit Climbing"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr "Canoeing"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr "Edit Canoeing"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr "Edit Cycling"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "Dog Racing"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr "Edit Dog Racing"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr "Equestrian"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr "Edit Equestrian"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr "Horse Racing"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr "Edit Horse Racing"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "Gymnastics"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr "Edit Gymnastics"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "Motor Sports"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr "Edit Motor Sports"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr "Skating"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr "Edit Skating"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr "Edit Skateboard"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "Swimming"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "Edit Swimming"
@@ -23143,56 +23993,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr "Edit Skiing"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr "Piste type"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr "downhill"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr "nordic"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr "Difficulty"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr "novice"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr "easy"
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr "intermediate"
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr "advanced"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "Shooting"
@@ -23200,182 +24046,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "Edit Shooting"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "Sport (Ball)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "Football"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr "Edit Football"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "American Football"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr "Edit American Football"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr "Edit Australian Football"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr "Edit Baseball"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "Edit Basketball"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr "Edit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr "Edit Boule"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr "Edit Bowls"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr "Edit Cricket"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr "Edit Cricket Nets"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr "Edit Croquet"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "Edit Hockey"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr "Edit Pelota"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr "Edit Racquet"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr "Edit Rugby"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "Table Tennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "Edit Table Tennis"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "Edit Tennis"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr "Man-Made"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Buildings"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "Building"
@@ -23383,5 +24229,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Public Building"
@@ -23389,10 +24235,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Edit Public Building"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "Town hall"
@@ -23400,10 +24246,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Edit Town hall"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Embassy"
@@ -23411,10 +24257,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Edit Embassy"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "Courthouse"
@@ -23423,10 +24269,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Edit Courthouse"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Prison"
@@ -23435,10 +24281,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Edit Prison"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Police"
@@ -23448,10 +24294,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Edit Police"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "Fire Station"
@@ -23460,10 +24306,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Edit Fire Station"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Post Office"
@@ -23471,5 +24317,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Edit Post Office"
@@ -23477,15 +24323,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "Preschool"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "Edit Preschool"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "School"
@@ -23493,10 +24339,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "Edit School"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "University"
@@ -23504,10 +24350,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "Edit University"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "College"
@@ -23515,5 +24361,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "Edit College"
@@ -23521,5 +24367,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Cinema"
@@ -23528,10 +24374,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Edit Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "Library"
@@ -23540,9 +24386,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Edit Library"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "Arts Centre"
@@ -23550,10 +24396,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "Edit Arts Centre"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Theatre"
@@ -23562,10 +24408,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Edit Theatre"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "Place of Worship"
@@ -23575,5 +24421,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "Edit Place of Worship"
@@ -23582,6 +24428,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "Religion"
@@ -23590,66 +24436,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "christian"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "jewish"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr "unitarian"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr "Denomination"
@@ -23658,81 +24504,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr "anglican"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "catholic"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr "evangelical"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr "jehovahs_witness"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Addresses"
@@ -23741,5 +24587,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Edit Address Information"
@@ -23747,5 +24593,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "House number"
@@ -23753,25 +24599,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "House name"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Street name"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "City name"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Post code"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "Country code"
@@ -23780,5 +24626,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "Edit Address Interpolation"
@@ -23786,61 +24632,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr "Numbering scheme"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "odd"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "even"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr "alphabetic"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr "Man Made"
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "Works"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "Edit Works"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Tower"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Edit Tower"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr "Tower type"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr "communication"
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr "observation"
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr "Height (metres)"
@@ -23848,25 +24694,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Water Tower"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Edit Water Tower"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "Edit Gasometer"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "Lighthouse"
@@ -23874,10 +24720,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Edit Lighthouse"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Windmill"
@@ -23885,10 +24731,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Edit Windmill"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -23897,37 +24743,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Edit Pipeline"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
+msgid "gas"
+msgstr "gas"
+
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr "heat"
+
+#: build/trans_presets.java:2353
 msgid "oil"
 msgstr "oil"
 
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-msgid "gas"
-msgstr "gas"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr "sewage"
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr "heat"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr "any substance"
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr "underwater"
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr "overground"
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "Sewerage Plant"
@@ -23937,10 +24783,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "Edit Sewerage Plant"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Crane"
@@ -23948,21 +24794,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Edit Crane"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr "Beacon"
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr "Edit Beacon"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "Survey Point"
@@ -23970,10 +24811,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "Edit Survey Point"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -23981,11 +24822,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Edit Surveillance Camera"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "Power Generator"
@@ -23995,35 +24848,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "Edit Power Generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "hydro"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "coal"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr "photovoltaic"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "Power Station"
@@ -24032,10 +24885,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "Edit Power Station"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "Power Sub Station"
@@ -24044,5 +24897,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "Edit Power Sub Station"
@@ -24050,10 +24903,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr "Line reference"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "Power Tower"
@@ -24064,23 +24917,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "Edit Power Tower"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr "tower"
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr "pole"
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr "Tower reference"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "Power Line"
@@ -24089,79 +24942,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "Edit Power Line"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr "Line type"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr "line"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr "minor_line"
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "Voltage"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr "Amount of Cables"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr "single"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr "double"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr "quad"
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr "Amenities"
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Toilets"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr "limited"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "Post Box"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Telephone"
@@ -24170,5 +25018,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Edit Telephone"
@@ -24176,5 +25024,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Coins"
@@ -24182,5 +25030,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "Notes"
@@ -24188,5 +25036,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr "Electronic purses and Charge cards"
@@ -24194,5 +25042,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr "Debit cards"
@@ -24200,15 +25048,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Credit cards"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Telephone cards"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Recycling"
@@ -24217,5 +25065,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Edit Recycling station"
@@ -24223,63 +25071,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "Cans"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "Clothes"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "Paper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "Scrap Metal"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+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:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr "Backrest"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr "stone"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr "plastic"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr "Colour"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr "black"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr "brown"
@@ -24358,5 +25217,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -24366,31 +25225,31 @@
 msgstr "green"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr "red"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr "blue"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr "gray"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr "white"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr "Amount of Seats"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr "Edit Hunting Stand"
@@ -24399,30 +25258,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "Height"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr "low"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr "half"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr "Hide"
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr "Lock"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "Fountain"
@@ -24431,10 +25290,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "Edit Fountain"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "Drinking Water"
@@ -24443,10 +25302,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Edit Drinking Water"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr "Baby Hatch"
@@ -24454,15 +25326,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr "Edit Baby Hatch"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Shops"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr "Car Dealer"
@@ -24470,10 +25342,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "Edit Car Shop"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr "Bike Dealer"
@@ -24482,28 +25354,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "Edit Bicycle Shop"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "Edit Supermarket"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr "Chemist"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr "Edit Chemist"
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr "Convenience Store"
@@ -24511,9 +25383,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr "Edit Convenience Store"
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -24521,27 +25393,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "Edit Kiosk"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr "Book Store"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr "Edit Book Store"
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr "Travel Agency"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr "Edit Travel Agency"
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "Vending machine"
@@ -24549,5 +25421,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "Edit Vending machine"
@@ -24555,88 +25427,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "Vending products"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr "public_transport_tickets"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr "public_transport_plans"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr "parking_tickets"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "food"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "drinks"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "sweets"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "animal_food"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "news_papers"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "toys"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "stamps"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "SIM-cards"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr "telephone_vouchers"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "condoms"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr "excrement_bags"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr "Account or loyalty cards"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "Butcher"
@@ -24644,9 +25516,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Edit Butcher"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "Baker"
@@ -24654,9 +25526,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Edit Baker"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "Florist"
@@ -24664,18 +25536,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "Edit Florist"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr "Organic"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr "Edit Organic Shop"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr "Alcohol"
@@ -24683,54 +25555,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr "Edit Alcohol Shop"
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr "Beverages"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr "Edit Beverages Shop"
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "Edit Computer Shop"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr "Electronics"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "Edit Electronics Shop"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr "Edit Hifi Shop"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr "Furniture"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "Edit Furniture Shop"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr "Garden Centre"
@@ -24738,9 +25610,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr "Edit Garden Centre"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr "Hardware"
@@ -24748,9 +25620,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr "Edit Hardware Store"
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "Do-it-yourself-store"
@@ -24758,54 +25630,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "Edit Do-it-yourself-store"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr "Stationery"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr "Edit Stationery Shop"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "Hairdresser"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "Edit Hairdresser"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr "Shoes"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "Edit Shoe Shop"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr "Toys"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "Edit Toy Shop"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr "Edit Video Shop"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Dry Cleaning"
@@ -24813,9 +25685,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Edit Dry Cleaning"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Laundry"
@@ -24823,9 +25695,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Edit Laundry"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr "Outdoor"
@@ -24833,28 +25705,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr "Edit Outdoor Shop"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr "Edit Sports Shop"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr "Optician"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "Edit Optician"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Cash"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Bank"
@@ -24862,14 +25734,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Edit Bank"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "Automated Teller Machine"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Money Exchange"
@@ -24877,5 +25749,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Edit Money Exchange"
@@ -24883,15 +25755,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Edit Automated Teller Machine"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Health"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "Doctors"
@@ -24899,18 +25771,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "Edit Doctors"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "Dentist"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "Edit Dentist"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Pharmacy"
@@ -24918,5 +25790,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Edit Pharmacy"
@@ -24924,9 +25796,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr "Dispensing"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Hospital"
@@ -24934,10 +25806,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Edit Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr "Emergency Access Point"
@@ -24946,5 +25818,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr "Edit Emergency Access Point"
@@ -24953,20 +25825,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr "Point Number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr "Point Name"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "Phone Number"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Use international code, like +12-345-67890)"
@@ -24974,5 +25846,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "Veterinary"
@@ -24981,64 +25853,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "Edit Veterinary"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr "Geography"
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Places"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Continent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Edit Continent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "Country"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Edit Country"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "State"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "Edit State"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "Edit Region"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr "County"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr "Edit County"
@@ -25046,15 +25918,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "City"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "Edit City"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "Town"
@@ -25062,10 +25934,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "Edit Town"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "Suburb"
@@ -25073,25 +25945,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "Edit Suburb"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Village"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Edit Village"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "Hamlet"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "Edit Hamlet"
@@ -25099,5 +25971,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr "Locality"
@@ -25105,10 +25977,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr "Edit Locality"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "Island"
@@ -25116,10 +25988,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Edit Island"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr "Islet"
@@ -25127,5 +25999,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr "Edit Islet"
@@ -25133,5 +26005,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "Cave Entrance"
@@ -25139,10 +26011,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "Edit Cave Entrance"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Peak"
@@ -25150,10 +26022,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Edit Peak"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "Glacier"
@@ -25161,10 +26033,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "Edit Glacier"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "Volcano"
@@ -25172,70 +26044,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "Edit Volcano"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Boundaries"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "National"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "Edit National Boundary"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "Edit Administrative Boundary"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr "Edit Civil Boundary"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr "Political"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "Edit Political Boundary"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr "National park"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "Edit National Park Boundary"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Land use"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Tree"
@@ -25244,15 +26116,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Edit Tree"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "Botanical Name"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "Wood"
@@ -25261,5 +26133,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "Edit Wood"
@@ -25267,17 +26139,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "coniferous"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "deciduous"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "mixed"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "Forest"
@@ -25286,14 +26158,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "Edit Forest Landuse"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "Nature Reserve"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "Edit Nature Reserve"
@@ -25301,25 +26173,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr "Scree"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr "Edit Scree"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr "Scrub"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr "Edit Scrub"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr "Fell"
@@ -25327,10 +26199,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr "Edit Fell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr "Heath"
@@ -25338,5 +26210,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "Edit Heath"
@@ -25344,5 +26216,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr "Farmyard"
@@ -25351,45 +26223,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr "Edit Farmyard Landuse"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "Farmland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr "Edit Farmland Landuse"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr "Meadow"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr "Edit Meadow Landuse"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "Vineyard"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "Edit Vineyard Landuse"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr "Allotments"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr "Edit Allotments Landuse"
@@ -25397,25 +26269,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "Garden"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "Edit Garden"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "Grass"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr "Edit Grass Landuse"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr "Village Green"
@@ -25423,10 +26295,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr "Edit Village Green Landuse"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr "Common"
@@ -25434,20 +26306,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr "Edit Common"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "Edit Park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr "Recreation Ground"
@@ -25455,5 +26327,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr "Edit Recreation Ground Landuse"
@@ -25461,15 +26333,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "Residential area"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr "Edit Residential Landuse"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "Graveyard"
@@ -25477,9 +26349,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Edit Graveyard"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "Cemetery"
@@ -25487,39 +26359,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "Edit Cemetery Landuse"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "Retail"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr "Edit Retail Landuse"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "Commercial"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr "Edit Commercial Landuse"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr "Edit Industrial Landuse"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr "Railway land"
@@ -25527,15 +26399,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr "Edit Railway Landuse"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "Military"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr "Edit Military Landuse"
@@ -25543,50 +26415,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "Construction area"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "Edit Construction Landuse"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr "Brownfield"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr "Edit Brownfield Landuse"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr "Greenfield"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr "Edit Greenfield Landuse"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr "Landfill"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr "Edit Landfill Landuse"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "Quarry"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "Edit Quarry Landuse"
@@ -25596,5 +26468,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr "Edit Multipolygon"
@@ -25603,10 +26475,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr "outer segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr "inner segment"
@@ -25614,5 +26486,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr "Turn restriction"
@@ -25621,5 +26493,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr "Edit Turn Restriction"
@@ -25627,34 +26499,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr "no left turn"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr "no right turn"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr "no straight on"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr "no U turn"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr "only turn right"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr "only turn left"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr "only straight on"
@@ -25663,15 +26535,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr "from way"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr "via node or way"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr "to way"
@@ -25679,5 +26551,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr "Route"
@@ -25686,5 +26558,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr "Edit Route"
@@ -25692,5 +26564,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr "Route type"
@@ -25781,5 +26653,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -25789,17 +26661,17 @@
 msgstr "bicycle"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr "road"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr "ski"
@@ -25859,5 +26731,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -25866,9 +26738,9 @@
 msgstr "foot"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr "detour"
@@ -25882,10 +26754,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "subway"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr "Symbol description"
@@ -25893,31 +26765,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr "Network"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr "Route state"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr "proposed"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr "alternate"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr "temporary"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr "connection"
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr "Colour (hex)"
@@ -25926,107 +26798,32 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr "route segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr "forward segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr "backward segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr "halt point"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr "forward halt point"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 msgid "backward halt point"
 msgstr "backward halt point"
-
-#. <!--
-#. 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 "standard"
 
 #. mappaint style named "standard"
@@ -26562,77 +27359,4 @@
 msgid "highway_track"
 msgstr "highway_track"
-
-#. 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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
-msgstr "rail"
 
 #. color rail
@@ -30158,147 +30882,152 @@
 msgstr "Sicily - Italy"
 
+#~ msgid "Move"
+#~ msgstr "Move"
+
+#~ msgid "Data Layer"
+#~ msgstr "Data Layer"
+
+#~ msgid "No data imported."
+#~ msgstr "No data imported."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Select a bookmark first."
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "No document open so nothing to save."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Unknown file extension."
+
+#~ msgid "Load Selection"
+#~ msgstr "Load Selection"
+
+#~ msgid "Contact {0}..."
+#~ msgstr "Contact {0}..."
+
+#~ msgid "Downloading..."
+#~ msgstr "Downloading..."
+
+#~ msgid "Refresh the selection list."
+#~ msgstr "Refresh the selection list."
+
+#~ msgid "Merging conflicts."
+#~ msgstr "Merging conflicts."
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Resolve Conflicts"
+
+#~ msgid "Delete the selected layer."
+#~ msgstr "Delete the selected layer."
+
+#~ msgid "Object"
+#~ msgstr "Object"
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "There were conflicts during import."
+
+#~ msgid "No time for point {0} x {1}"
+#~ msgstr "No time for point {0} x {1}"
+
+#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
+#~ msgstr "Cannot read time \"{0}\" from point {1} x {2}"
+
+#~ msgid "No images with readable timestamps found."
+#~ msgstr "No images with readable timestamps found."
+
+#~ msgid "GPS start: {0}"
+#~ msgstr "GPS start: {0}"
+
+#~ msgid "GPS end: {0}"
+#~ msgstr "GPS end: {0}"
+
+#~ msgid "current delta: {0}s"
+#~ msgstr "current delta: {0}s"
+
+#~ msgid "timezone difference: "
+#~ msgstr "timezone difference: "
+
+#~ msgid "{0} within the track."
+#~ msgstr "{0} within the track."
+
+#~ msgid "Sync clock"
+#~ msgstr "Sync clock"
+
+#~ msgid "The date in file \"{0}\" could not be parsed."
+#~ msgstr "The date in file \"{0}\" could not be parsed."
+
+#~ msgid "There is no EXIF time within the file \"{0}\"."
+#~ msgstr "There is no EXIF time within the file \"{0}\"."
+
+#~ msgid "Image"
+#~ msgstr "Image"
+
+#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+#~ msgstr "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+
+#~ msgid "Time entered could not be parsed."
+#~ msgstr "Time entered could not be parsed."
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ msgstr "Hint: Some changes came from uploading new data to the server."
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Unsaved Changes"
+
+#~ msgid "my version:"
+#~ msgstr "my version:"
+
+#~ msgid "their version:"
+#~ msgstr "their version:"
+
+#~ msgid "resolved version:"
+#~ msgstr "resolved version:"
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Contacting the OSM server..."
+
+#~ msgid "Error while parsing"
+#~ msgstr "Error while parsing"
+
 #~ msgid ""
-#~ "Failed to add an OAuth authentication header. There is currently no OAuth "
-#~ "Access Token configured."
+#~ "Login password to the OSM account. Leave blank to not store any password."
 #~ msgstr ""
-#~ "Failed to add an OAuth authentication header. There is currently no OAuth "
-#~ "Access Token configured."
-
-#~ msgid "The plugin could not be removed. Probably it was already disabled"
-#~ msgstr "The plugin could not be removed. Probably it was already disabled"
-
-#~ msgid "Bridleway"
-#~ msgstr "Bridleway"
-
-#~ msgid "Cycleway"
-#~ msgstr "Cycleway"
-
-#~ msgid "Footway"
-#~ msgstr "Footway"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Track Grade 1"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Edit Track of grade 1"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Track Grade 2"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Edit Track of grade 2"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Track Grade 3"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Edit Track of grade 3"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Track Grade 4"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Edit Track of grade 4"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Track Grade 5"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Edit Track of grade 5"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Edit Hiking"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "Mountain Hiking"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Edit Mountain Hiking"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Edit Demanding Mountain Hiking"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Edit Alpine Hiking"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Edit Demanding Alpine Hiking"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Edit Difficult Alpine Hiking"
-
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "Parameter ''{0}'' must not be null"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parameter ''{0}'' must not be null"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-
-#~ msgid ""
-#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
-#~ "This can lead to nodes being deleted accidentally.\n"
-#~ "Are you really sure to continue?"
-#~ msgstr ""
-#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
-#~ "This can lead to nodes being deleted accidentally.\n"
-#~ "Are you really sure to continue?"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-
-#~ msgid "Exactly four doubles excpected in string, got {0}"
-#~ msgstr "Exactly four doubles expected in string, got {0}"
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "expected id >= 0. Got {0}"
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "parameter ''{0}'' is not an acceptable class, got ''{1}''"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr "parameter ''{0}'' in range 0..{1} expected, got {2}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "parameter current out of range: got {0}"
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "unexpected column index. Got {0}"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "Parameter 'col' must be 0 or 1. Got {0}"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "parameter ''{0}'' must not be empty"
-
-#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
-#~ msgstr "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
-
-#~ msgid "Dialog not created yet. Invoke createInstance() first"
-#~ msgstr "Dialog not created yet. Invoke createInstance() first"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Conflicts in data"
-
-#~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
-#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
-#~ "the new role?</html>"
-#~ msgstr ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
-#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
-#~ "the new role?</html>"
-
-#~ msgid "Value of child.getId() > 0 expected. Got {1}."
-#~ msgstr "Value of child.getId() > 0 expected. Got {1}."
+#~ "Login password to the OSM account. Leave blank to not store any password."
+
+#~ msgid "Unknown version"
+#~ msgstr "Unknown version"
+
+#~ msgid "Incorrect password or username."
+#~ msgstr "Incorrect password or username."
+
+#~ msgid "Enter Password"
+#~ msgstr "Enter Password"
+
+#~ msgid "Error during parse."
+#~ msgstr "Error during parse."
+
+#~ msgid "position"
+#~ msgstr "position"
+
+#~ msgid "different"
+#~ msgstr "different"
+
+#~ msgid "true"
+#~ msgstr "true"
+
+#~ msgid "false"
+#~ msgstr "false"
+
+#~ msgid "Resolve {0} conflicts in {1} objects"
+#~ msgstr "Resolve {0} conflicts in {1} objects"
+
+#~ msgid "Change"
+#~ msgstr "Change"
+
+#~ msgid "unnamed"
+#~ msgstr "unnamed"
+
+#~ msgid "Cannot open preferences directory: {0}"
+#~ msgstr "Cannot open preferences directory: {0}"
 
 #~ msgid "image"
@@ -30306,165 +31035,4 @@
 #~ msgstr[0] "image"
 #~ msgstr[1] "images"
-
-#~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-#~ msgstr "Expected instance of OsmDataLayer. Got ''{0}''."
-
-#~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "id parameter ''{0}'' > 0 required. Got {1}"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-#~ msgstr "parameter ''{0}'' >= 0 expected, got ''{1}''"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "Plugin {0} requires JOSM update to version {1}."
-
-#~ msgid "Move"
-#~ msgstr "Move"
-
-#~ msgid "Data Layer"
-#~ msgstr "Data Layer"
-
-#~ msgid "No data imported."
-#~ msgstr "No data imported."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Select a bookmark first."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "No document open so nothing to save."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Unknown file extension."
-
-#~ msgid "Load Selection"
-#~ msgstr "Load Selection"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Contact {0}..."
-
-#~ msgid "Downloading..."
-#~ msgstr "Downloading..."
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Refresh the selection list."
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Merging conflicts."
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Resolve Conflicts"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Delete the selected layer."
-
-#~ msgid "Object"
-#~ msgstr "Object"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "There were conflicts during import."
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "No time for point {0} x {1}"
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Cannot read time \"{0}\" from point {1} x {2}"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "No images with readable timestamps found."
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "GPS start: {0}"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "GPS end: {0}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "current delta: {0}s"
-
-#~ msgid "timezone difference: "
-#~ msgstr "timezone difference: "
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} within the track."
-
-#~ msgid "Sync clock"
-#~ msgstr "Sync clock"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "The date in file \"{0}\" could not be parsed."
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "There is no EXIF time within the file \"{0}\"."
-
-#~ msgid "Image"
-#~ msgstr "Image"
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Time entered could not be parsed."
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "Hint: Some changes came from uploading new data to the server."
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Unsaved Changes"
-
-#~ msgid "my version:"
-#~ msgstr "my version:"
-
-#~ msgid "their version:"
-#~ msgstr "their version:"
-
-#~ msgid "resolved version:"
-#~ msgstr "resolved version:"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Contacting the OSM server..."
-
-#~ msgid "Error while parsing"
-#~ msgstr "Error while parsing"
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-
-#~ msgid "Unknown version"
-#~ msgstr "Unknown version"
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Incorrect password or username."
-
-#~ msgid "Enter Password"
-#~ msgstr "Enter Password"
-
-#~ msgid "Error during parse."
-#~ msgstr "Error during parse."
-
-#~ msgid "position"
-#~ msgstr "position"
-
-#~ msgid "different"
-#~ msgstr "different"
-
-#~ msgid "true"
-#~ msgstr "true"
-
-#~ msgid "false"
-#~ msgstr "false"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Resolve {0} conflicts in {1} objects"
-
-#~ msgid "Change"
-#~ msgstr "Change"
-
-#~ msgid "unnamed"
-#~ msgstr "unnamed"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Cannot open preferences directory: {0}"
 
 #~ msgid "{0} object has conflicts:"
@@ -30513,7 +31081,4 @@
 #~ msgstr "Update"
 
-#~ msgid "Station"
-#~ msgstr "Station"
-
 #~ msgid "Navigation"
 #~ msgstr "Navigation"
@@ -30761,7 +31326,4 @@
 #~ msgstr "Only one node selected"
 
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Please select ways with almost right angles to orthogonalise."
-
 #~ msgid "Please select at least one task to download"
 #~ msgstr "Please select at least one task to download"
@@ -30860,4 +31422,49 @@
 #~ msgstr "YAHOO (GNOME Fix)"
 
+#~ msgid "Motorboat"
+#~ msgstr "Motorboat"
+
+#~ msgid "Boat"
+#~ msgstr "Boat"
+
+#~ msgid "Bridleway"
+#~ msgstr "Bridleway"
+
+#~ msgid "Cycleway"
+#~ msgstr "Cycleway"
+
+#~ msgid "Footway"
+#~ msgstr "Footway"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "Track Grade 3"
+
+#~ msgid "Track Grade 2"
+#~ msgstr "Track Grade 2"
+
+#~ msgid "Track Grade 1"
+#~ msgstr "Track Grade 1"
+
+#~ msgid "Edit Hiking"
+#~ msgstr "Edit Hiking"
+
+#~ msgid "Track Grade 5"
+#~ msgstr "Track Grade 5"
+
+#~ msgid "Track Grade 4"
+#~ msgstr "Track Grade 4"
+
+#~ msgid "Edit Demanding Mountain Hiking"
+#~ msgstr "Edit Demanding Mountain Hiking"
+
+#~ msgid "Edit Alpine Hiking"
+#~ msgstr "Edit Alpine Hiking"
+
+#~ msgid "Mountain Hiking"
+#~ msgstr "Mountain Hiking"
+
+#~ msgid "Edit Mountain Hiking"
+#~ msgstr "Edit Mountain Hiking"
+
 #~ msgid "Drawbridge"
 #~ msgstr "Drawbridge"
@@ -30883,7 +31490,4 @@
 #~ msgid "bicyclemap"
 #~ msgstr "bicyclemap"
-
-#~ msgid "board"
-#~ msgstr "board"
 
 #~ msgid "Charge"
@@ -31027,4 +31631,13 @@
 
 #~ msgid ""
+#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
+#~ "This can lead to nodes being deleted accidentally.\n"
+#~ "Are you really sure to continue?"
+#~ msgstr ""
+#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
+#~ "This can lead to nodes being deleted accidentally.\n"
+#~ "Are you really sure to continue?"
+
+#~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
 #~ "latitudes between 46.1° and 57° only.\n"
@@ -31095,7 +31708,4 @@
 #~ msgstr "sports"
 
-#~ msgid "Public"
-#~ msgstr "Public"
-
 #~ msgid "Selected makes your trace public in openstreetmap.org"
 #~ msgstr "Selected makes your trace public in openstreetmap.org"
@@ -31193,4 +31803,25 @@
 #~ msgstr "Offset between track and photos: {0}m {1}s"
 
+#~ msgid "Edit Track of grade 1"
+#~ msgstr "Edit Track of grade 1"
+
+#~ msgid "Edit Track of grade 2"
+#~ msgstr "Edit Track of grade 2"
+
+#~ msgid "Edit Track of grade 3"
+#~ msgstr "Edit Track of grade 3"
+
+#~ msgid "Edit Track of grade 4"
+#~ msgstr "Edit Track of grade 4"
+
+#~ msgid "Edit Track of grade 5"
+#~ msgstr "Edit Track of grade 5"
+
+#~ msgid "Edit Demanding Alpine Hiking"
+#~ msgstr "Edit Demanding Alpine Hiking"
+
+#~ msgid "Edit Difficult Alpine Hiking"
+#~ msgstr "Edit Difficult Alpine Hiking"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Edit Drawbridge"
@@ -31214,7 +31845,4 @@
 #~ msgid "Map Type"
 #~ msgstr "Map Type"
-
-#~ msgid "Interpolation"
-#~ msgstr "Interpolation"
 
 #~ msgid "Optional"
@@ -31331,4 +31959,7 @@
 #~ "elements when merge decisions are applied."
 
+#~ msgid ">"
+#~ msgstr ">"
+
 #~ msgid "WARNING: unexpected value for preference conflict.resolution, got "
 #~ msgstr "WARNING: unexpected value for preference conflict.resolution, got "
@@ -31336,4 +31967,7 @@
 #~ msgid "Apply partial resolutions"
 #~ msgstr "Apply partial resolutions"
+
+#~ msgid "Plugin {0} requires JOSM update to version {1}."
+#~ msgstr "Plugin {0} requires JOSM update to version {1}."
 
 #~ msgid "Reached the end of the line"
@@ -31541,4 +32175,7 @@
 #~ msgstr "The XML source (URL or filename) for {0} definition files."
 
+#~ msgid "Conflicts in data"
+#~ msgstr "Conflicts in data"
+
 #~ msgid "Defaults (See tooltip for detailed information)"
 #~ msgstr "Defaults (See tooltip for detailed information)"
@@ -31582,4 +32219,7 @@
 #~ "was: {0}"
 
+#~ msgid "Dialog not created yet. Invoke createInstance() first"
+#~ msgstr "Dialog not created yet. Invoke createInstance() first"
+
 #~ msgid ""
 #~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
@@ -31610,4 +32250,13 @@
 #~ "{0}"
 
+#~ msgid ""
+#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
+#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
+#~ "the new role?</html>"
+#~ msgstr ""
+#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
+#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
+#~ "the new role?</html>"
+
 #~ msgid "Linked"
 #~ msgstr "Linked"
@@ -31617,4 +32266,7 @@
 #~ msgstr ""
 #~ "Warning: failed to put history browser always on top. Exception was: {0}"
+
+#~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+#~ msgstr "Expected instance of OsmDataLayer. Got ''{0}''."
 
 #~ msgid ""
@@ -31624,4 +32276,7 @@
 #~ "Failed to close changeset {0}, will be closed by server after timeout. "
 #~ "Exception was: {1}"
+
+#~ msgid "The plugin could not be removed. Probably it was already disabled"
+#~ msgstr "The plugin could not be removed. Probably it was already disabled"
 
 #~ msgid ""
@@ -31703,7 +32358,19 @@
 #~ "\"{1}\">your language</A>."
 
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "parameter ''{0}'' must not be null"
+
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr "expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "unexpected return value. Got {0}"
 
+#~ msgid "Expected ID >= 0. Got {0}."
+#~ msgstr "expected id >= 0. Got {0}"
+
+#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
+#~ msgstr "parameter ''{0}'' is not an acceptable class, got ''{1}''"
+
 #~ msgid "There's no primitive with version {0} in this history."
 #~ msgstr "There's no primitive with version {0} in this history"
@@ -31712,4 +32379,7 @@
 #~ msgstr "There's no version valid at date ''{0}'' in this history"
 
+#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
+#~ msgstr "parameter ''{0}'' in range 0..{1} expected, got {2}"
+
 #~ msgid "No earliest version found. History is empty."
 #~ msgstr "no earliest version found. History is empty."
@@ -31717,4 +32387,19 @@
 #~ msgid "No latest version found. History is empty."
 #~ msgstr "no latest version found. History is empty."
+
+#~ msgid "Parameter current out of range. Got {0}."
+#~ msgstr "parameter current out of range: got {0}"
+
+#~ msgid "Unexpected column index. Got {0}."
+#~ msgstr "unexpected column index. Got {0}"
+
+#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
+#~ msgstr "Parameter 'col' must be 0 or 1. Got {0}"
+
+#~ msgid "Parameter ''{0}'' must not be empty."
+#~ msgstr "parameter ''{0}'' must not be empty"
+
+#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
+#~ msgstr "parameter ''{0}'' with tags for exactly one key expected. Got {1}"
 
 #~ msgid "Index out of bounds. Got {0}."
@@ -31734,4 +32419,18 @@
 #~ "''{1}''"
 
+#~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "id parameter ''{0}'' > 0 required. Got {1}"
+
+#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
+#~ msgstr "parameter ''{0}'' >= 0 expected, got ''{1}''"
+
+#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+
+#~ msgid ""
+#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
+#~ msgstr ""
+#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
+
 #~ msgid "Replace"
 #~ msgstr "Replace"
@@ -31742,4 +32441,7 @@
 #~ msgid "No type found. History is empty."
 #~ msgstr "No type found. History is empty."
+
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "Parameter ''{0}'' must not be null"
 
 #~ msgid ""
@@ -31750,4 +32452,7 @@
 #~ "missing on this system.</html>"
 
+#~ msgid "Value of child.getId() > 0 expected. Got {1}."
+#~ msgstr "Value of child.getId() > 0 expected. Got {1}."
+
 #~ msgid "Use an open changeset"
 #~ msgstr "Use an open changeset"
@@ -31755,2 +32460,12 @@
 #~ msgid "Preset group ''{0}'' of group ''{1}''"
 #~ msgstr "Preset group ''{0}'' of group ''{1}''"
+
+#~ msgid "Exactly four doubles excpected in string, got {0}"
+#~ msgstr "Exactly four doubles expected in string, got {0}"
+
+#~ msgid ""
+#~ "Failed to add an OAuth authentication header. There is currently no OAuth "
+#~ "Access Token configured."
+#~ msgstr ""
+#~ "Failed to add an OAuth authentication header. There is currently no OAuth "
+#~ "Access Token configured."
Index: applications/editors/josm/i18n/po/es.po
===================================================================
--- applications/editors/josm/i18n/po/es.po	(revision 19689)
+++ applications/editors/josm/i18n/po/es.po	(revision 19698)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-19 00:01-0500\n"
-"PO-Revision-Date: 2010-01-17 00:48-0500\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-23 22:16+0000\n"
 "Last-Translator: Leo Arias <yo@elopio.net>\n"
 "Language-Team: Spanish <es@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-01-13 18:26+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -70,11 +70,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -244,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -256,13 +256,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -271,5 +271,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -295,5 +298,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Unir"
@@ -323,5 +326,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -388,9 +391,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -398,5 +401,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "Aceptar"
@@ -447,6 +452,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -464,5 +469,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -471,11 +476,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -512,5 +517,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "conflicto"
@@ -645,14 +650,14 @@
 msgstr "Por favor, selecciona al menos dos vías para combinar."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Copia los objetos seleccionados al portapapeles"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Por favor, seleccione algo que copiar."
@@ -685,8 +690,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -695,5 +700,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -753,16 +758,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Existió {0} conflictos durante la importación."
-msgstr[1] "Existió {0} conflictos durante la importación."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "Conflictos durante la descarga"
-msgstr[1] "Conflictos durante la descarga"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -783,4 +787,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -790,4 +796,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplicar la selección mediante copiar y pegar de inmediato."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Duplicar vía"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "Editar la relación seleccionada"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "Capa: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "Zoom a {0}"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr ""
 
 #. <button label="Info" hotkey="I">
@@ -881,10 +915,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 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] "La vía seleccionada no contiene el nodo seleccionado."
-msgstr[1] "La vía seleccionada no contiene todos los nodos seleccionados."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -1007,5 +1040,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "URL"
@@ -1158,5 +1191,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+#, fuzzy
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr "<html>No se pudo abrir la carpeta.<br>¡Seleccione un archivo!"
 
@@ -1170,9 +1204,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Abriendo {0} archivos..."
-msgstr[1] "Abriendo {0} archivos..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1228,7 +1262,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1242,5 +1276,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "Mover nodos de forma que todos los águlos tengan 90 o 270 grados."
 
@@ -1283,4 +1318,9 @@
 "html>"
 
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+#, fuzzy
+msgid "Selection must consist only of ways and nodes."
+msgstr "El multipolígono debe consistir únicamente de vías cerradas."
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
 msgid "Orthogonalize"
@@ -1295,4 +1335,15 @@
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "Los elementos seleccionados no pueden ser ortogonalizados"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr "Por favor seleccione vías de ángulos casi rectos para ortogonalizar."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1309,9 +1360,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151
 msgid "Delete incomplete members?"
-msgstr ""
+msgstr "¿Borrar los miembros incompletos?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152
 msgid "Paste without incomplete members"
-msgstr ""
+msgstr "Pegar sin los miembros incompletos"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
@@ -1321,4 +1372,7 @@
 "incomplete primitives?"
 msgstr ""
+"Los datos copiados contienen primitivas incompletas. Al pegar se borrarán "
+"las primitivas incompletas. ¿Quieres pegar los datos sin las primitivas "
+"incompletas?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
@@ -1400,18 +1454,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1436,12 +1490,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Error"
@@ -1577,5 +1632,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1780,9 +1835,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "{0} nodos duplicados dentro de {1} nodos"
-msgstr[1] "{0} nodos duplicados dentro de {1} nodos"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1826,5 +1881,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr "Descargar datos"
@@ -1929,5 +1984,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:25
 msgid "Enable/disable rendering the map as wireframe only"
-msgstr ""
+msgstr "Activar/desactivar la visualización del mapa únicamente como líneas"
 
 #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:26
@@ -2264,6 +2319,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2347,7 +2402,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
-#, fuzzy
 msgid "<not>"
-msgstr "norte"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
@@ -2360,7 +2414,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
-#, fuzzy
 msgid "<right parent>"
-msgstr "Falta el paréntesis derecho"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
@@ -2390,5 +2443,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Búsqueda de objetos."
@@ -2572,4 +2625,6 @@
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
+"Usar <b>\"</b> para entrecomillar las operaciones (p.e. si una llave "
+"contiene <b>:</b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:144
@@ -2592,5 +2647,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Buscar"
@@ -2630,25 +2685,22 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "CS"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
-msgstr "CI"
+msgstr ""
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
-msgstr "RX"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2662,5 +2714,5 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2668,5 +2720,5 @@
 "de uso: clave=valor"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2687,14 +2739,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:634
 msgid "Missing parameter for OR"
-msgstr ""
+msgstr "Falta un parámetro para el 'OR'"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
-msgstr "Credencial de autentificación inexperada: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
 msgid "Missing operator for NOT"
-msgstr ""
+msgstr "Falta un para para el 'NOT'"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:710
@@ -2733,4 +2785,6 @@
 msgid "Incorrect value of changeset operator: {0}. Number is expected."
 msgstr ""
+"Valor incorrecto para el operador de modificaciones. {0}. Se esperaba un "
+"número."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:744
@@ -2738,4 +2792,5 @@
 msgid "Incorrect value of version operator: {0}. Number is expected."
 msgstr ""
+"Valor incorrecto del operador de la versión: {0}. Se esperaba un número."
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58
@@ -2744,4 +2799,6 @@
 "Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
 msgstr ""
+"Aviso: se ha recortado automáticamente el valor del atributo ''{0}'' en el "
+"objeto borrado {1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67
@@ -2751,4 +2808,6 @@
 "length {2}. Values length is {3}."
 msgstr ""
+"La longitud del valor para la etiqueta ''{0}'' en el objeto {1} supera la "
+"longitud máxima permitida {2}. La longitud es {3}."
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70
@@ -2808,9 +2867,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "Añadidos {0} objetos"
-msgstr[1] "Añadidos {0} objetos"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2860,12 +2919,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "Eliminar \"{0}\" de {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Establecer {0}={1} para {2} {3}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2927,19 +2986,20 @@
 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:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Modo de borrado"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Eliminar {0} vía"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Eliminar {0} relación"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -3020,9 +3080,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "{0} objetos eliminados"
-msgstr[1] "{0} objetos eliminados"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -3072,24 +3132,24 @@
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "Undelete {0} primitive"
 msgid_plural "Undelete {0} primitives"
-msgstr[0] "Deshacer borrado de {0} primitivas"
-msgstr[1] "Deshacer borrado de {0} primitivas"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for node {0}"
-msgstr "Resolver conflictos de versión para el nodo {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for way {0}"
-msgstr "Resolver conflictos de versión para la vía {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Resolver conflictos de versión para la relación {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3174,10 +3234,10 @@
 #, java-format
 msgid "Illegal latitude value ''{0}''"
-msgstr ""
+msgstr "Valor de latitud ilegal \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:77
 #, java-format
 msgid "Illegal longitude value ''{0}''"
-msgstr ""
+msgstr "Valor de longitud ilegal \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
@@ -3275,5 +3335,5 @@
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
+msgstr "Error: Línea ''{0}'' inesperada en el archivo de marcapáginas ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
@@ -3282,4 +3342,6 @@
 "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
 msgstr ""
+"Error: Valor doble ilegal ''{0}'' en línea ''{1}'' en el archivo de "
+"marcapáginas ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
@@ -3301,4 +3363,5 @@
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
 msgstr ""
+"Error: Línea ''{0}'' inesperada en la lista de marcapáginas del servidor"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
@@ -3308,4 +3371,6 @@
 "server"
 msgstr ""
+"Error: Valor doble ilegal ''{0}'' en la línea ''{1}'' en la lista de "
+"marcapáginas del servidor"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
@@ -3321,5 +3386,5 @@
 #, java-format
 msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
+msgstr "Fallo al cargar el recurso \"{0}\", el error es: {1}."
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:93
@@ -3333,4 +3398,6 @@
 "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 msgstr ""
+"Atención: Número de versión de JOSM inesperado en el fichero de revisión, el "
+"valor es ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:140
@@ -3358,5 +3425,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3364,5 +3431,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3370,5 +3437,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3376,5 +3443,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3446,8 +3513,7 @@
 #. column header: hide filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
-#, fuzzy
 msgctxt "filter"
 msgid "H"
-msgstr "H"
+msgstr ""
 
 #. column header: filter text
@@ -3459,67 +3525,60 @@
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "C"
+msgstr ""
 
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
-#, fuzzy
 msgctxt "filter"
 msgid "I"
-msgstr "I"
+msgstr ""
 
 #. column header: filter mode
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
-#, fuzzy
 msgctxt "filter"
 msgid "M"
-msgstr "M"
+msgstr ""
 
 #. translators notes must be in front
 #. filter mode: replace
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210
-#, fuzzy
 msgctxt "filter"
 msgid "R"
-msgstr "R"
+msgstr ""
 
 #. filter mode: add
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211
-#, fuzzy
 msgctxt "filter"
 msgid "A"
-msgstr "A"
+msgstr ""
 
 #. filter mode: remove
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212
-#, fuzzy
 msgctxt "filter"
 msgid "D"
-msgstr "D"
+msgstr ""
 
 #. filter mode: in selection
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213
-#, fuzzy
 msgctxt "filter"
 msgid "F"
-msgstr "F"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "una proimitiva con id=0 no puede ser invisible"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "Se esperaba un ID >0. Obtenido {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "Se esperaba una versión > 0. Encontrada {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3528,5 +3587,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3534,5 +3593,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3657,6 +3716,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3666,5 +3725,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3675,7 +3734,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3697,5 +3756,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "fondo"
@@ -3716,5 +3775,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:25
 msgid "areatext"
-msgstr ""
+msgstr "area de texto"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26
@@ -3732,4 +3791,6 @@
 "NTF<->RGF93 grid"
 msgstr ""
+"Aviso: Error al abrir la secuencia de entrada para el recurso ''/ data/"
+"{0}''. No se puede cargar NTF <-> malla RGF93"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:137
@@ -3751,15 +3812,15 @@
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
-msgstr ""
+msgstr "{0} ({1} a {2} grados)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
 #, java-format
 msgid "{0} (Corsica)"
-msgstr ""
+msgstr "{0} (Córcega)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:260
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
 msgid "Lambert CC Zone"
-msgstr ""
+msgstr "Zona CC-Lambert"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133
@@ -3777,18 +3838,18 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
-msgstr ""
+msgstr "PUWG (Polonia)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:106
 msgid "PUWG Zone"
-msgstr ""
+msgstr "Zona PUWG"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
 msgid "PUWG 1992 (Poland)"
-msgstr ""
+msgstr "PUWG 1992 (Polonia)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
-msgstr ""
+msgstr "PUWG 2000 zona {0} (Polonia)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
@@ -3806,17 +3867,17 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25
 msgid "Guadeloupe Fort-Marigot 1949"
-msgstr ""
+msgstr "Guadalupe Fuerte Marigot 1949"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26
 msgid "Guadeloupe Ste-Anne 1948"
-msgstr ""
+msgstr "Guadalupe Sta Ana 1948"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27
 msgid "Martinique Fort Desaix 1952"
-msgstr ""
+msgstr "Martinica Fuerte Desaix 1952"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:386
 msgid "UTM 20N (France)"
-msgstr ""
+msgstr "UTM 20N (Francia)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:398
@@ -3839,8 +3900,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39
 msgid "Do not show again (remembers choice)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+msgstr "No mostrar otra vez (recordar elección)"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3848,37 +3909,38 @@
 msgstr " [ID: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "incompleto"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "ferrocarril"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "vía fluvial"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "uso del suelo"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3887,10 +3949,10 @@
 msgstr[1] "{0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+msgstr "transporte público"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3899,5 +3961,5 @@
 msgstr[1] "miembros {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3934,6 +3996,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Conflicto"
@@ -3941,15 +4003,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:249
 msgid "Authentication Failed"
-msgstr ""
+msgstr "Identificación errónea"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-#, fuzzy
-msgid "Authorization Failed"
-msgstr "Conexión fallida."
+msgid "Authorisation Failed"
+msgstr "Autorización incorrecta"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
 #, fuzzy
 msgid "Authentication failed"
-msgstr "Conexión fallida."
+msgstr "Identificación errónea"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:299
@@ -3984,4 +4045,5 @@
 msgid "Expected non-empty value for parameter ''{0}'', got ''{1}''"
 msgstr ""
+"Esperado un valor no-vacío para el parámetro ''{0}'', suministrado ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
@@ -4087,4 +4149,5 @@
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
+"Abrir archivo (cualquier tipo de archivo que puede abrirse con Archivo/Abrir)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
@@ -4094,5 +4157,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:81
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
-msgstr ""
+msgstr "Descargar datos GPS desde URL (con lat=x&lon=y&zoom=z)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
@@ -4110,5 +4173,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Set the language"
-msgstr ""
+msgstr "Definir idioma"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
@@ -4131,4 +4194,8 @@
 "megabytes"
 msgstr ""
+"nota: JOSM necesita mucha memoria para algunas tareas. Puede ser necesario "
+"añadir\n"
+"      la opción de Java siguiente para especificar el tamaño máximo asignado "
+"en megabytes"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
@@ -4144,8 +4211,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
 msgid "Make sure you load some data if you use --selection."
-msgstr ""
+msgstr "Hay que cargar algún dato si se usa --selección."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Inicializar"
@@ -4153,9 +4219,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
 msgid "Updating plugins..."
-msgstr ""
+msgstr "Actualizando complementos..."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:176
 msgid "Installing updated plugins"
-msgstr ""
+msgstr "Instalando complementos actualizados"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:180
@@ -4186,5 +4252,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4195,5 +4261,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Editar"
@@ -4264,29 +4330,29 @@
 msgstr "escalar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 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:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 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:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 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:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 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:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 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:106
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 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:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4294,9 +4360,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(sin objeto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4341,4 +4407,6 @@
 "relation</strong>.</html>"
 msgstr ""
+"<html>Confirme el borrado <strong>1 objeto</strong> de <strong>1 relación</"
+"strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152
@@ -4349,4 +4417,6 @@
 "relations</strong>.</html>"
 msgstr ""
+"<html>Confirme el borrado <strong>1 objeto</strong> de <strong>{0} "
+"relaciones</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156
@@ -4356,4 +4426,6 @@
 "relations</strong>.</html>"
 msgstr ""
+"<html>Confirme el borrado <strong>{0} objetos</strong> de <strong>{1} "
+"relaciones</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165
@@ -4462,16 +4534,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Etiquetas ({0} conflictivas)"
-msgstr[1] "Etiquetas ({0} conflictivas)"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "{0} pending tag conflict to be resolved"
 msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} etiquetas conflictivas pendientes de ser resueltas"
-msgstr[1] "{0} etiquetas conflictivas pendientes de ser resueltas"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
@@ -4530,16 +4602,16 @@
 msgstr "Resolución de conflictos"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "inexperado valor del parámetro \"index\". Obtenido {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4754,5 +4826,5 @@
 #, java-format
 msgid "Adjustable {0} not registered yet."
-msgstr ""
+msgstr "El componente personalizable {0} no está registrado."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
@@ -4760,9 +4832,14 @@
 msgstr "Nodo"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 "Los nodos fusionados aún no están congelados. No se puede construir la orden "
 "de resolución."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4790,5 +4867,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional node used by way {1}<br>which is deleted on the "
@@ -4798,11 +4875,5 @@
 "server.<br><br>Do you want to undelete these nodes too?"
 msgstr[0] ""
-"<html>Hay {0} nodos adicionales usados por la vía {1}<br>que están borrados "
-"en el servidor.<br><br>¿Quiere deshacer el borrado de esos nodos también?</"
-"html>"
 msgstr[1] ""
-"<html>Hay {0} nodos adicionales usados por la vía {1}<br>que están borrados "
-"en el servidor.<br><br>¿Quiere deshacer el borrado de esos nodos también?</"
-"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
@@ -4811,5 +4882,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional primitive referred to by relation {1}<br>which is "
@@ -4819,11 +4890,5 @@
 "deleted on the server.<br><br>Do you want to undelete these too?"
 msgstr[0] ""
-"<html>Hay {0} primitivos adicionales a los que se refiere la relación {1}"
-"<br>que están borrados en el servidor.<br><br>¿Quiere deshacer también el "
-"borrado de los primitivos?</html>"
 msgstr[1] ""
-"<html>Hay {0} primitivos adicionales a los que se refiere la relación {1}"
-"<br>que están borrados en el servidor.<br><br>¿Quiere deshacer también el "
-"borrado de los primitivos?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
@@ -4929,5 +4994,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr "No, abortar"
@@ -4940,4 +5005,7 @@
 "yo agree?</html>"
 msgstr ""
+"<html>Para mantener su versión local, JOSM<br>tiene que poner a 0 el ID de "
+"los objetos {0} to 0.<br>En la siguiente subida, el servidor asignará una "
+"nueva ID.<br> ¿Continuar? </html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588
@@ -4959,4 +5027,6 @@
 "dataset.<br>Do you agree?</html>"
 msgstr ""
+"<html>JOSM borrará la primitiva local con id {0}<br>del dataset.<br>¿Está de "
+"acuerdo?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:627
@@ -4973,5 +5043,10 @@
 msgstr "Primitiva"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -5107,10 +5182,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "ninguno"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "todos"
@@ -5122,15 +5197,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68
 msgid "Please decide which values to keep"
-msgstr ""
+msgstr "Decide que valores hay que mantener"
 
 #: ../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 ""
+msgstr "El valor ''{0}'' será aplicado a la clave ''{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 ""
+msgstr "La clave ''{0}'' y todos sus valores serán suprimidos"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84
@@ -5140,7 +5215,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-#, fuzzy, java-format
+#, java-format
 msgid "Tag collection does not include the selected value ''{0}''."
-msgstr "La vía seleccionada no contiene el nodo seleccionado."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
@@ -5190,7 +5265,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -5200,6 +5275,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5212,8 +5287,9 @@
 msgid "Position {0} is out of range. Current number of members is {1}."
 msgstr ""
+"La posición {0} está fuera de rango. El número de miembros actual es {1}."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 msgid "Remove this relation member from the relation"
-msgstr ""
+msgstr "Suprimir este miembro de la relación"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
@@ -5239,5 +5315,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
 msgid "Enter a role for all relation memberships"
-msgstr ""
+msgstr "Introduzca un rol para todos los miembros de la relación"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
@@ -5278,4 +5354,10 @@
 "place of the original way in the relation.</html>"
 msgstr ""
+"<html>Las vías combinadas son miembros de una o más relaciones. Por favor, "
+"decida si desea <strong>mantener</strong> la relación entre estos elementos, "
+"o <strong>eliminarla.</strong> <br> Por defecto, <strong>mantiene</strong> "
+"la primera vía, y <strong>elimina</strong> las otras vías que son miembros "
+"de la misma relación. La vía combinada se mantiene en la posición original "
+"de la primera vía.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
@@ -5295,5 +5377,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
 msgid "Orig. Way"
-msgstr ""
+msgstr "Vía original"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
@@ -5313,9 +5395,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:49
 msgid "Show tags with multiple values only"
-msgstr ""
+msgstr "Muestra sólo los atributos con valores múltiples"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:161
 msgid "For selected objects only"
-msgstr ""
+msgstr "Sólo para objetos seleccionados"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:162
@@ -5325,17 +5407,21 @@
 "html>"
 msgstr ""
+"<html>Activar para mostrar las Modificaciones de los objetos seleccionados."
+"<br>Desactivar para mostrar todas las Modificaciones de los objetos de la "
+"capa actual.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 msgid "Changesets"
-msgstr ""
+msgstr "Modificaciones"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:255
 msgid "Open the list of changesets in the current layer."
-msgstr ""
+msgstr "Abre la lista de modificaciones de la capa actual."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:300
 msgid "Select all objects assigned to the currently selected changesets"
 msgstr ""
+"Selecciona todos los objetos asignados a las modificaciones seleccionadas"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:359
@@ -5348,8 +5434,10 @@
 msgid "Download information about the selected changesets from the OSM server"
 msgstr ""
+"Descarga información sobre las modificaciones seleccionadas desde el "
+"servidor OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:395
 msgid "Closes the selected open changesets"
-msgstr ""
+msgstr "Cierra las modificaciones abiertas seleccionadas"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:426
@@ -5360,13 +5448,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:427
 msgid "Open a web page for each selected changeset"
-msgstr ""
+msgstr "Abre una página web para cada modificacion seleccionada"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:466
 msgid "Details"
-msgstr ""
+msgstr "Detalles"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:467
 msgid "Opens the Changeset Manager window for the selected changesets"
-msgstr ""
+msgstr "Abre el gestor de modificaciones para las modificaciones seleccionadas"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -5381,10 +5469,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5404,13 +5492,13 @@
 msgstr "Pila de comandos: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr "Resolver conflictos."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Resolver"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
@@ -5418,6 +5506,6 @@
 "en la lista superior."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5451,5 +5539,5 @@
 "<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.Click <strong>{0}</strong> to close anyway."
+"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.</"
@@ -5472,8 +5560,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:49
 msgid "Filter objects and hide/disable them."
-msgstr ""
+msgstr "Filtra objetos y los oculta/visualiza."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5482,5 +5570,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5538,5 +5626,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:254
 msgid "Object with history"
-msgstr ""
+msgstr "Objeto con histórico"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
@@ -5559,45 +5647,50 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:312
 msgid "Display the history of the selected objects."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+msgstr "Mostrar el histórico de los objetos seleccionados."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Capas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 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:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+msgstr "Suprime las capas seleccionadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Mostrar/Ocultar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr "Activar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr "Activa la capa selecionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr "Combina esta capa con otra"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Duplicar vía"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 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:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Mover la capa seleccionada una fila abajo"
@@ -5611,6 +5704,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Relaciones"
@@ -5620,69 +5713,69 @@
 msgstr "Abrir una lista de todas las relaciones."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relaciones: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Abrir un editor para la relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Borrar la relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Crear un anueva relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Crear una copia de esta relación y abrirla en otra ventana de edición."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+msgstr "Selecciona los miembros de todas las relaciones seleccionadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+msgstr "Seleccionar miembros"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+msgstr "Descarga todos los miembros de las relaciones seleccionadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+msgstr "Descargar miembros"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Selección actual"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Abrir una ventana de selección."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Zoom a los elementos seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Zoom a la selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sel.: Rel.:{0} / Vías:{1} / Nodos:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5690,5 +5783,5 @@
 msgstr "Selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5740,4 +5833,6 @@
 "Warning: only launching info browsers for the first {0} of {1} selected users"
 msgstr ""
+"Aviso: sólo se mostrará información para el primero {0} de {1} usuarios "
+"seleccionados"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:216
@@ -5754,5 +5849,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:268
 msgid "<new object>"
-msgstr ""
+msgstr "<nuevo objeto>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:281
@@ -5766,17 +5861,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:179
 msgid "Display the basic properties of the changeset"
-msgstr ""
+msgstr "Muestra las propiedades básicas de la modificación"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:181
 msgid "Display the tags of the changeset"
-msgstr ""
+msgstr "Muestra los atributos de la modificación"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:182
 msgid "Content"
-msgstr ""
+msgstr "Contenido"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:183
 msgid "Display the objects created, updated, and deleted by the changeset"
 msgstr ""
+"Muestra los objetos creados, actualizados y borrados del conjunto de cambios"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:339
@@ -5788,47 +5884,50 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:163
 msgid "Query"
-msgstr ""
+msgstr "Consulta"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:358
 msgid "Launch the dialog for querying changesets"
-msgstr ""
+msgstr "Muestra el diálogo para consultar modificaciones"
 
 #: ../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 ""
+msgstr "Elin¡minar de la memoria"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:383
 msgid "Remove the selected changesets from the local cache"
-msgstr ""
+msgstr "Elimina las modificaciones seleccionadas de la memoria local"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:410
 msgid "Close the selected changesets"
-msgstr ""
+msgstr "Cierra la modificación seleccionada"
 
 #: ../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 ""
+msgstr "Actualizar la modificación"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:450
 msgid "Updates the selected changesets with current data from the OSM server"
 msgstr ""
+"Actualiza las el ocnjunto de cambios seleccionado con los datos actuales del "
+"servidor OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:475
 msgid "Download changeset content"
-msgstr ""
+msgstr "Descarga el contenido de las modificaciones"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:477
 msgid "Download the content of the selected changesets from the server"
 msgstr ""
+"Descarga el contenido de las modificaciones seleccionadas desde el servidor"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:510
 msgid "My changesets"
-msgstr ""
+msgstr "Mis modificaciones"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:512
 msgid "Download my changesets from the OSM server (max. 100 changesets)"
-msgstr ""
+msgstr "Descarga mis modificaciones del servidor OSM (100 modificaciones máx.)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:518
@@ -5842,5 +5941,5 @@
 msgctxt "changeset.upload-comment"
 msgid "empty"
-msgstr ""
+msgstr "vacío"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:62
@@ -5848,5 +5947,5 @@
 msgctxt "changeset.state"
 msgid "Open"
-msgstr ""
+msgstr "Abierto"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:64
@@ -5854,5 +5953,5 @@
 msgctxt "changeset.state"
 msgid "Closed"
-msgstr ""
+msgstr "Cerrado"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:73
@@ -5860,13 +5959,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:154
 msgid "anonymous"
-msgstr ""
+msgstr "anónimo"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:30
 msgid "Comment"
-msgstr ""
+msgstr "Comentario"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38
 msgid "Open"
-msgstr ""
+msgstr "Abrir"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
@@ -5877,9 +5976,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:54
 msgid "Created at"
-msgstr ""
+msgstr "Creado el"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:62
 msgid "Closed at"
-msgstr ""
+msgstr "Cerrado el"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:69
@@ -5889,15 +5988,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:179
 msgid "Downloading changeset content"
-msgstr ""
+msgstr "Descargando el contenido de la modificación"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:170
 #, java-format
 msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
+msgstr "({0}/{1}) Descargando modificación {2}..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:177
 #, java-format
 msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
+msgstr "({0}/{1}) Descargando el contenido para el conjunto de cambios {2}..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:176
@@ -5906,5 +6005,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:306
 msgid "Download content"
-msgstr ""
+msgstr "Descargar contenido"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:178
@@ -5913,33 +6012,33 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:308
 msgid "Download the changeset content from the OSM server"
-msgstr ""
+msgstr "Descarga el contenido de la modificación del servidor 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 ""
+msgstr "Actualizar contenido"
 
 #: ../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 ""
+msgstr "Actualiza el contenido del conjunto de cambios desde el servidor 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 ""
+msgstr "Mostrar histórico"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250
 msgid "Download and show the history of the selected primitives"
-msgstr ""
+msgstr "Descarga y muestra el histórico de las primitivas seleccionadas"
 
 #: ../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 ""
+msgstr "Seleccionar en capa"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:317
 msgid "Select the corresponding primitives in the current data layer"
-msgstr ""
+msgstr "Selecciona las primitivas correspondientes en la capa de datos actual"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:324
@@ -5958,47 +6057,49 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:370
 msgid "Nothing to select"
-msgstr ""
+msgstr "Nada para seleccionar"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:377
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:425
 msgid "Zoom to in layer"
-msgstr ""
+msgstr "Ajustar a la capa"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379
 msgid "Zoom to the corresponding primitives in the current data layer"
 msgstr ""
+"Ajusta la visualización de las primitivas correspondientes en la capa de "
+"datos actual"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:439
 msgid "Nothing to zoom to"
-msgstr ""
+msgstr "Nada para ampliar"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
 msgid "The content of this changeset is not downloaded yet."
-msgstr ""
+msgstr "No se ha descargado el contenido de esta modificación."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download now"
-msgstr ""
+msgstr "Descargar ahora"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
 msgid "Download the changeset content"
-msgstr ""
+msgstr "Descarga el contenido de la modificación"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:50
 msgid "Created"
-msgstr ""
+msgstr "Creado"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:51
 msgid "Updated"
-msgstr ""
+msgstr "Actualizado"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:52
 msgid "Deleted"
-msgstr ""
+msgstr "Eliminado"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:32
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. item "Highways/Streets/Motorway" text "Reference"
@@ -6041,8 +6142,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -6114,4 +6213,7 @@
 #. <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 />
@@ -6190,6 +6292,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6231,6 +6334,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6699,152 +6804,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Nombre"
@@ -6852,33 +6959,33 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:115
 msgid "ID:"
-msgstr ""
+msgstr "ID:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:128
 msgid "Comment:"
-msgstr ""
+msgstr "Comentario:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:143
 msgid "Open/Closed:"
-msgstr ""
+msgstr "Abierto/Cerrado:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:155
 msgid "Created by:"
-msgstr ""
+msgstr "Creado por:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:168
 msgid "Created on:"
-msgstr ""
+msgstr "Creado en:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:180
 msgid "Closed on:"
-msgstr ""
+msgstr "Cerrado el:"
 
 #: ../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 ""
+msgstr "Eliminar la modificación en la vista de detalle de la memoria local"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:325
 msgid "Update the changeset from the OSM server"
-msgstr ""
+msgstr "Actualizar el conjunto de cambios desde el servidor de OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:358
@@ -6895,4 +7002,6 @@
 "the current<br>edit layer ''{1}''.</html>"
 msgstr ""
+"<html>Ninguno de los objetos contenidos en la modificación {0} está "
+"disponible<br> en la capa de edición actual ''{1}''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:427
@@ -6901,4 +7010,6 @@
 "layer"
 msgstr ""
+"Ajusta la visualización en la capa de datos actual a las primitivas "
+"contenidas en la modificación"
 
 #. parent for dialog is Main.parent
@@ -6906,26 +7017,26 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java:127
 msgid "Download changesets"
-msgstr ""
+msgstr "Descargar modificaciones"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36
 #, java-format
 msgid "{0} [incomplete]"
-msgstr ""
+msgstr "{0} [incompleta]"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41
 msgid "open"
-msgstr ""
+msgstr "abrir"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41
 msgid "closed"
-msgstr ""
+msgstr "cerrado"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:45
 msgid "Changeset ID: "
-msgstr ""
+msgstr "Modificación ID: "
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:47
 msgid "Enter a changset id"
-msgstr ""
+msgstr "Introduzca un ID de modificación"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:79
@@ -6933,4 +7044,6 @@
 "Download the changeset with the specified id, including the changeset content"
 msgstr ""
+"Descarga la modificación con el id especificado, incluyendo el contenido de "
+"la modificación"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:141
@@ -6943,13 +7056,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
-msgstr ""
+msgstr "Introduzca un valor entero > 0"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
-msgstr ""
+msgstr "Seleccionar modificaciones según propietario"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
 msgstr ""
+"Selecciona las modificaciones dependiendo de quien las haya abierto o cerrado"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
@@ -6957,40 +7071,45 @@
 "Select changesets based on the date/time they have been created or closed"
 msgstr ""
+"Selecciona la modificaciones basándose en la fecha/hora en que hayan sido "
+"creadas o cerradas."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
 msgstr ""
+"Selecciona los ocnjuntos de cambios relativos a un recuadro de selección"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
-msgstr ""
+msgstr "Consultar sólo en las modificaciones abiertas"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
-msgstr ""
+msgstr "Consultar sólo en las modificaciones cerradas"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
-msgstr ""
+msgstr "Consultar en las modificaciones abiertas y cerradas"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID:"
-msgstr ""
+msgstr "ID de usuario:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name:"
-msgstr ""
+msgstr "Nombre de usuario:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
-msgstr ""
+msgstr "Sólo modificaciones realizadas por mí"
 
 #: ../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 ""
+msgstr "Sólo modificaciones realizadas por el usuario con el siguiente 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 ""
+"Sólo modificaciones realizadas por el usuario con el siguiente "
+"nombrecambioscambios"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
@@ -7012,42 +7131,44 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
 msgid "Please enter a valid user ID"
-msgstr ""
+msgstr "Introduzca un ID de usuario válido"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
-msgstr ""
+msgstr "ID de usuario inválido"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
 msgid "Please enter a non-empty user name"
-msgstr ""
+msgstr "Introduzca un nombre de usuario no vacío"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
-msgstr ""
+msgstr "Nombre de usuario inválido"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
 msgid "Date: "
-msgstr ""
+msgstr "Fecha: "
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
-msgstr ""
+msgstr "Cerrado después de - "
 
 #: ../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 ""
+msgstr "Fecha:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
-msgstr ""
+msgstr "Creado antes de - "
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
 msgid "Only changesets closed after the following date/time"
-msgstr ""
+msgstr "Sólo las modificaciones cerradas después de la fecha/hora siguiente"
 
 #: ../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 ""
+"Sólo las modificaciones cerradas después y creadas antes de una fecha/hora "
+"determinada"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
@@ -7062,8 +7183,10 @@
 "specific time range.</html>"
 msgstr ""
+"<html>Introduzca valores de fecha/hora válidos para<br> restringir la "
+"consulta a un rango de tiempo de terminado.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:868
 msgid "Invalid date/time values"
-msgstr ""
+msgstr "valores de fecha/hora inválidos"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
@@ -7078,8 +7201,10 @@
 "changeset query to a specific bounding box.</html>"
 msgstr ""
+"<html>Introduzca valores válidos de longitud/latitud para restringir<br>la "
+"consulta de modificaciones a una ventana de selección</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
-msgstr ""
+msgstr "Ventana de selección inválida"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
@@ -7097,5 +7222,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
 msgid "Please enter an non-empty user name"
-msgstr ""
+msgstr "Introduzca un nombre de usuario no vacío"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
@@ -7105,4 +7230,6 @@
 "<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 msgstr ""
+"Introduzca la fecha en el formato habitual de su zona.<br>Ejemplo: {0}"
+"<br>Ejemplo: {1}<br>Ejemplo: {2}<br>Ejemplo: {3}<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1133
@@ -7112,8 +7239,10 @@
 "{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 msgstr ""
+"Introduzca la hora en el formato habitual de su zona.<br>Ejemplo: {0}"
+"<br>Ejemplo: {1}<br>Ejemplo: {2}<br>Ejemplo: {3}<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:108
 msgid "Download my changesets only"
-msgstr ""
+msgstr "Descargar sólo mis modificaciones"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:109
@@ -7122,4 +7251,6 @@
 "include all changesets in the query.</html>"
 msgstr ""
+"<html>Activar para restringir la consulta a las modificaciones propias."
+"<br>Desactivar para incluir todas las modificaciones en la consulta.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:193
@@ -7137,67 +7268,68 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:52
 msgid "Download changesets using predefined queries"
-msgstr ""
+msgstr "Descargar modificaciones usando consultas predefinidas"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:54
 msgid "From URL"
-msgstr ""
+msgstr "Desde la URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
 msgid "Query changesets from a server URL"
-msgstr ""
+msgstr "Descargar modificaciones desde un servidor"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:57
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
 msgid "Advanced"
-msgstr ""
+msgstr "Avanzado"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
 msgid "Use a custom changeset query"
-msgstr ""
+msgstr "Formular una consulta de modificaciones"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:82
 msgid "Query changesets"
-msgstr ""
+msgstr "Consultar modificaciones"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:165
 msgid "Query and download changesets"
-msgstr ""
+msgstr "Consulta y descarga modificaciones"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:171
 msgid "Please enter a valid changeset query URL first."
-msgstr ""
+msgstr "Introduzca una URL con una consulta de modificaciones válida."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:172
 msgid "Illegal changeset query URL"
-msgstr ""
+msgstr "URL de consulta de modificaciones incorrecta"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:209
 msgid "Close the dialog and abort querying of changesets"
-msgstr ""
+msgstr "Cierra el diálogo y aborta la consulta de modificaciones"
 
 #: ../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 ""
+msgstr "Consultando y descargando modificaciones"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:136
 msgid "Determine user id for current user..."
-msgstr ""
+msgstr "Determinar el ID de usuario para el usuario actual..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java:164
 msgid "Query and download changesets ..."
-msgstr ""
+msgstr "Consultar y descargar modificaciones..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:42
 msgid "URL: "
-msgstr ""
+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 ""
+"Introduzca o pegue una URL para recuperar modificaciones de la API de OSM."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
 msgid "Examples"
-msgstr ""
+msgstr "Ejemplos"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
@@ -7210,5 +7342,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:174
 msgid "This changeset query URL is invalid"
-msgstr ""
+msgstr "La URL de consulta de modificaciones no es válida"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
@@ -7216,10 +7348,10 @@
 msgid "This will change {0} object."
 msgid_plural "This will change up to {0} objects."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Se modificará {0} objeto."
+msgstr[1] "Se modificarán {0} objetos."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:183
 msgid "An empty value deletes the tag."
-msgstr ""
+msgstr "Un valor vacío borra el atributo."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
@@ -7227,5 +7359,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<diferente>"
@@ -7281,57 +7413,57 @@
 msgstr "Añadir propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propiedades: {0} / Miembros: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Propiedades / Miembros"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Cambiar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "Borrar de la relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "¿Seguro de eliminar la selección de la relación {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Borrar la clave seleccionada en todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "Eliminar propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Añadir una nueva pareja clave/valor para todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editar el valor de la clave seleccionada para todos los objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+msgstr "Seleccionar relación"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+msgstr "Seleccionar la relación en la selección principal."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+msgstr "Seleccionar en la lista de relaciones"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
-msgstr ""
+msgstr "Seleccionar relación en la lista de relaciones."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:178
@@ -7367,9 +7499,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1093
-#, fuzzy
 msgid "Conflict in data"
 msgid_plural "Conflicts in data"
-msgstr[0] "Conflicto en los datos"
-msgstr[1] "Conflicto en los datos"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:345
@@ -7397,4 +7528,5 @@
 msgid "Warning: ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
+"Aviso: Ignorando la excepción porque se ha cancelado la tarea. Excepción: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:82
@@ -7407,10 +7539,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
 msgid "Download relations"
-msgstr ""
+msgstr "Descargar relaciones"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
 #, java-format
 msgid "({0}/{1}): Downloading relation ''{2}''..."
-msgstr ""
+msgstr "({0}/{1}): Descargando relación ''{2}''..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149
@@ -7545,13 +7677,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 msgid "Reverse the order of the relation members"
-msgstr ""
+msgstr "Invertir el orden de los miembros de la relación"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
 msgid "Reverse"
-msgstr ""
+msgstr "Invertir"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
 msgid "Relation Editor: Reverse"
-msgstr ""
+msgstr "Editor de relaciones: Invertir"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927
@@ -7584,5 +7716,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984
 msgid "Delete the currently edited relation"
-msgstr ""
+msgstr "Eliminar esta relación"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1074
@@ -7616,4 +7748,6 @@
 "<br>Please resolve this conflict first, then try again.</html>"
 msgstr ""
+"<html>La capa ''{0}'' tiene un conflicto con la primitiva <br>''{1}''.<br>Es "
+"necesario resolver el conflicto antes de continuar.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120
@@ -7635,5 +7769,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217
 msgid "Download all incomplete members"
-msgstr ""
+msgstr "Descargar todos los miembros incompletos"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
@@ -7649,5 +7783,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252
 msgid "Download selected incomplete members"
-msgstr ""
+msgstr "Descargar los miembros incompletos seleccionados"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1291
@@ -7671,7 +7805,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
-#, fuzzy
 msgid "Do you really want to apply the new role?"
-msgstr "¿Está seguro que quiere eliminar la capa ''{0}''?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
@@ -7704,5 +7837,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:212
 msgid "Zooming disabled because layer of this relation is not active"
-msgstr ""
+msgstr "Zoom desactivado, porque la capa de esta relación no está activa"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java:217
@@ -7727,4 +7860,5 @@
 msgid "Warning: Ignoring exception because task is cancelled. Exception: {0}"
 msgstr ""
+"Aviso: Se ignora la excepción porque la tarea se ha cancelado. Error: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:63
@@ -7742,5 +7876,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142
 msgid "Edit the currently selected relation"
-msgstr ""
+msgstr "Editar la relación seleccionada"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -7765,16 +7899,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
 msgid "Load relation"
-msgstr ""
+msgstr "Cargar relación"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr ""
-"Ignorar excepción porque la descarga ha sido cancelada. La excepción fue: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr ""
+msgstr "La vía estça conectada"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
@@ -7784,5 +7917,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
-msgstr ""
+msgstr "La vía está conectada con un miembro de la siguiente relación"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
@@ -7790,49 +7923,49 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Marcadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
+msgstr "<html>No se ha seleccionada ningún area de descarga.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+#, fuzzy
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
 msgstr ""
 "<html><strong>Área de descarga actual</strong> (minlat,minlon, maxlat, "
 "maxlon): {0}, {1}, {2}, {3}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr "Crear marcador"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:185
 msgid "Add a bookmark for the currently selected download area"
 msgstr "Añadir un marcador para la zona de descarga seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187
+#: ../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:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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 "Por favor, introduzca un nombre el marcador del área de descarga"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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:212
+msgstr "Nombre del lugar"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:217
 msgid "Remove the currently selected bookmarks"
 msgstr "Eliminar los marcadores actualmente seleccionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr "Renombrar el marcador actualmente seleccionado"
@@ -7869,22 +8002,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
-#, fuzzy, java-format
+#, java-format
 msgid "The string ''{0}'' is not a valid double value."
-msgstr "el parámetro \"{0}\" no es un nombre de tipo válido, se obtuvo \"{1}\""
+msgstr ""
 
 #: ../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 ""
+msgstr "Para la latitud se requiere un valor en el rango [-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 ""
+msgstr "Para la longitud se requiere un valor en el rango [-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 ""
+msgstr "Pegar URL del portapapeles"
 
 #. adding the download tasks
@@ -7925,5 +8058,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "No area selected yet"
-msgstr ""
+msgstr "No hay ninguna área seleccionada aún"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:218
@@ -7958,21 +8091,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr "Tipo de clase"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr "Límites"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr "Cerca de"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
-msgstr ""
+msgstr "Zoom"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:101
@@ -7980,34 +8113,34 @@
 msgstr "Elegir el servidor para la búsqueda:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
 msgid "Enter a place name to search for:"
 msgstr "Introduzca un lugar para buscar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+#: ../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:147
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:148
 msgid "Areas around places"
 msgstr "Áreas en torno a lugares"
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Excepción de puntero nulo, posiblemente alguna etiqueta esté perdida"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr "Buscar..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr ""
@@ -8018,7 +8151,9 @@
 #. 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" />
@@ -8027,10 +8162,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Tipo"
@@ -8039,5 +8175,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -8049,17 +8185,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "desconocido"
@@ -8167,15 +8302,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444
 msgid "Go to the previous page"
-msgstr ""
+msgstr "Ir a la página anterior"
 
 #. putValue(NAME, tr("Forward"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464
 msgid "Go to the next page"
-msgstr ""
+msgstr "Ir a la página siguiente"
 
 #. putValue(NAME, tr("Home"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480
 msgid "Go to the JOSM help home page"
-msgstr ""
+msgstr "Ir a la página de ayuda de JOSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511
@@ -8190,17 +8325,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562
 msgid "Failed to open help page"
-msgstr ""
+msgstr "Fallo al abrir la página de ayuda"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
 msgid "Latitude: "
-msgstr ""
+msgstr "Latitud: "
 
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
 msgid "Longitude: "
-msgstr ""
+msgstr "Longitud: "
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136
 msgid "Coordinates"
-msgstr ""
+msgstr "Coordenadas"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
@@ -8221,5 +8356,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:143
 msgid "Reload the history from the server"
-msgstr ""
+msgstr "Recargar el historial desde el servidor"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:274
@@ -8259,15 +8394,15 @@
 #, java-format
 msgid "Loading history for node {0}"
-msgstr ""
+msgstr "Cargando historial para el nodo {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:187
 #, java-format
 msgid "Loading history for way {0}"
-msgstr ""
+msgstr "Cargando historial para la vía {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:188
 #, java-format
 msgid "Loading history for relation {0}"
-msgstr ""
+msgstr "Cargando historial para la relación {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
@@ -8279,9 +8414,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195
 msgid "Zoom to node"
-msgstr ""
+msgstr "Zoom a nodo"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
 msgid "Zoom to this node in the current data layer"
-msgstr ""
+msgstr "Zoom a este nodo en la actual capa de datos"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:242
@@ -8302,9 +8437,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:60
 msgid "not present"
-msgstr ""
+msgstr "no presente"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:55
 msgid "Changeset"
-msgstr ""
+msgstr "Conjunto de cambios"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
@@ -8336,5 +8471,5 @@
 #, java-format
 msgid "Version {0}, {1} (by {2})"
-msgstr ""
+msgstr "Versión {0}, {1} (por {2})"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:78
@@ -8346,9 +8481,9 @@
 #, java-format
 msgid "Version {0} in editor"
-msgstr ""
+msgstr "Versión {0} en editor"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
 msgid "[deleted]"
-msgstr ""
+msgstr "[borrado]"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
@@ -8416,5 +8551,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr "Se han detectado conflictos"
@@ -8514,5 +8649,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87
 msgid "Upload to a new changeset"
-msgstr ""
+msgstr "Subir a un nuevo conjunto de cambios"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:88
@@ -8523,5 +8658,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:97
 msgid "Upload to an existing changeset"
-msgstr ""
+msgstr "Subir un conjunto de cambios existente"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98
@@ -8544,5 +8679,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:315
 msgid "Close the currently selected open changeset"
-msgstr ""
+msgstr "Cerrar el conjunto de cambios seleccionado abierto"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55
@@ -8574,5 +8709,5 @@
 #, java-format
 msgid "Closing changeset {0}"
-msgstr ""
+msgstr "Cerrando conjunto de cambios {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99
@@ -8596,18 +8731,16 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:237
 msgid "Please enter the user name of your OSM account"
-msgstr ""
+msgstr "Por favor, introduzca el nombre de usuario de su cuenta de OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:238
 msgid "Please enter the password name of your OSM account"
-msgstr ""
+msgstr "Por favor, introduzca la contraseña de su cuenta de OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Authenticating at the OSM API ''{0}'' failed. Please enter a valid username "
 "and a valid password."
 msgstr ""
-"<html> Autentificación en el proxy HTTP ''{0}'' fallida. Por favor, "
-"introduzca un nombre de usuario y una contraseña válida.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242
@@ -8644,13 +8777,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279
 msgid "Authenticate"
-msgstr ""
+msgstr "Autenticación"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280
 msgid "Authenticate with the supplied username and password"
-msgstr ""
+msgstr "Autenticarse con el nombre de usuario y contraseña suministrado"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293
 msgid "Cancel authentication"
-msgstr ""
+msgstr "Cancelar autentificación"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:63
@@ -8876,9 +9009,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8888,7 +9021,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -8900,16 +9033,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "Capa"
@@ -8938,13 +9071,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106
 msgid "Initializing nodes to update ..."
-msgstr ""
+msgstr "Inicializando nodos a actualizar ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122
 msgid "Initializing ways to update ..."
-msgstr ""
+msgstr "Inicializando vías a actualizar ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131
 msgid "Initializing relations to update ..."
-msgstr ""
+msgstr "Inicializando relaciones a actualizar ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:116
@@ -8954,5 +9087,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:117
 msgid "Decide how to upload the data and which changeset to use"
-msgstr ""
+msgstr "Decida cómo cargar los datos y que conjunto de cambios usar"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:120
@@ -8993,5 +9126,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:367
 msgid "Illegal upload comment"
-msgstr ""
+msgstr "Comentario de subida no válido"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:376
@@ -9005,5 +9138,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411
 msgid "Cancel the upload and resume editing"
-msgstr ""
+msgstr "Cancelar la carga y reanudar la edición"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:453
@@ -9196,5 +9329,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266
 msgid "Cancel uploading"
-msgstr ""
+msgstr "Cancelar subida"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86
@@ -9314,6 +9447,6 @@
 msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} objeto a modificar:"
+msgstr[1] "{0} objetos a modificar:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113
@@ -9324,68 +9457,68 @@
 msgstr[1] "{0} objetos para eliminar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "punto GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Personalice el dibujo de línea"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../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:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Personalizar colores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Seleccionar una color"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr "Marcadores desde puntos nombrados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Puntos de traza nombrados desde {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Importar audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9395,23 +9528,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "archivos Wave Audio (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcadores de audio desde {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Importar imágenes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9421,5 +9554,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9427,5 +9560,5 @@
 msgstr "Nombre: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9433,5 +9566,5 @@
 msgstr "Descripción: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9441,23 +9574,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "Descripción"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+msgstr "Intervalo de tiempo"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr "Longitud"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Longitud: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9466,5 +9599,5 @@
 msgstr[1] "{0} rutas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9473,10 +9606,10 @@
 msgstr[1] "{0} nodos de vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Convertir en capa de datos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9486,43 +9619,43 @@
 "peligroso.<br>Si quiere subir trazas, consulte aquí:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces (EN)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Convertido desde: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "Descargar datos de OSM a lo largo de esta traza"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Descargar todo entre:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "Área máxima por petición:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9533,9 +9666,9 @@
 "<br¿Desea continuar?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 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:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9546,5 +9679,5 @@
 "comienzo."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9554,23 +9687,23 @@
 "tiempos fueran razonablemente estimados se han omitido."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Capa de datos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "fuera del área descargada"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr "versión {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9579,5 +9712,5 @@
 msgstr[1] "Se han detectado {0} conflictos."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9591,5 +9724,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9606,45 +9739,45 @@
 "dialogo de Conflictos y resuélvalos manualmente."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
 msgid_plural "{0} deleted"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+msgstr[0] "{0} eliminado"
+msgstr[1] "{0} eliminados"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} formado por:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr "sin ajustar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr "Versión del API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Convertir a capa de gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+msgstr "No se han encontrado problemas"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9691,28 +9824,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "Puntos GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Archivos GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, 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:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, 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:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "No se pudo leer \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9724,34 +9856,34 @@
 "lee en la foto y seleccione una zona horaria<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr "Hora de la foto (desde exif)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 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:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/aaaa hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 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:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "Sin fecha"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr "Abrir otra foto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 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:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9761,64 +9893,64 @@
 "Por favor, utilice el formato requerido."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "Fecha no válida"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 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:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr "Traza GPX: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr "Abrir otra traza gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+msgstr "Ajuste manual"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr "Zona horaria: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr "Ajuste:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9828,52 +9960,52 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 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:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr "Correlación"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr "Zona horaria no válida"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr "Desplazamiento inválido"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+msgstr "Volver a intentar"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Zona horaria: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutos: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Segundos: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
 msgid_plural "Time difference of {0} days"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+msgstr[0] "(Diferencia de tiempo de {0} día)"
+msgstr[1] "(Diferencia de tiempo de {0} días)"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9884,13 +10016,13 @@
 "manual."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr "Ajuste de fotografías a traza fallido"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr "Ajustar zona horaria y la diferencia temporal"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 msgid "The selected photos do not contain time information."
 msgstr ""
@@ -9898,9 +10030,9 @@
 "fueron tomadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 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:979
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -9910,17 +10042,17 @@
 "seleccione otra."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 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:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr "Debe seleccionar una traza GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr "No se ha seleccionado una traza GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9931,5 +10063,5 @@
 "Formato esperado: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9940,75 +10072,75 @@
 "Formato esperado: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extrayendo localizaciones GPS del EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr "Iniciando escaneo del directorio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 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:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "Leyendo fotos..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Leyendo {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, 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:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Escaneando directorio {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, 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:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, 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:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Imagenes Geoetiquetadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr "Correlacionar con GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "No se han cargado los datos."
-msgstr[1] "No se han cargado los datos."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
+#, java-format
 msgid "{0} was found to be GPS tagged."
 msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] "Se encontraron {0} geoetiquetadas."
-msgstr[1] "Se encontraron {0} geoetiquetadas."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -10017,5 +10149,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10112,5 +10244,5 @@
 msgstr "Marcador gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10118,5 +10250,5 @@
 msgstr[1] "marcadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10125,9 +10257,9 @@
 msgstr[1] "{0} consiste en los marcadores {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "Sincronizar audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10135,20 +10267,20 @@
 "Necesita pausar el audio en el momento que oiga su entrada de sincronización"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr "Audio sincronizado en el punto {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 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:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -10158,18 +10290,18 @@
 "marcador."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 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:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Mostrar/Esconder Texto/Iconos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 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:171
+#: ../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 "
@@ -10179,5 +10311,5 @@
 "pista de sonido estaba reproduciendo (rebasado el primer marcador)."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -10187,5 +10319,5 @@
 "marcador de audio o a un punto de traza, en donde quiera sincronizar."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "No se ha podido crear un marcador de audio nuevo"
@@ -10211,19 +10343,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
+#, java-format
 msgid ""
 "Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
 msgstr ""
-"Error al cargar marcadores desde ''{0}'' por razones de seguridad. La "
-"excepción fue: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
-#, fuzzy, java-format
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
+#, java-format
 msgid ""
 "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
 msgstr ""
-"Error al cargar marcadores desde ''{0}'' por razones de seguridad. La "
-"excepción fue: {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
@@ -10271,7 +10399,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
 msgid "Authorize URL:"
-msgstr "Autor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10295,13 +10422,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:58
 msgid "Fully automatic"
-msgstr ""
+msgstr "Enteramente automático"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:61
 msgid "Semi-automatic"
-msgstr ""
+msgstr "Semiautomático"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:64
 msgid "Manual"
-msgstr ""
+msgstr "Manual"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:73
@@ -10331,14 +10458,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
 msgid "Username: "
-msgstr ""
+msgstr "Nombre de usuario: "
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:127
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
 msgid "Password: "
-msgstr ""
+msgstr "Contraseña: "
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:175
 msgid "Granted rights"
-msgstr ""
+msgstr "Derechos concedidos"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:176
@@ -10361,7 +10488,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
 msgid "Authorize now"
-msgstr "Autor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10420,7 +10546,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
-#, fuzzy
 msgid "OAuth authorization failed"
-msgstr "Conexión fallida."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
@@ -10500,7 +10625,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
 msgid "Please select an authorization procedure: "
-msgstr "Por favor, selecciona al menos cuatro nodos."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10510,7 +10634,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
-#, fuzzy
 msgid "Close the dialog and cancel authorization"
-msgstr "Cerrar cuadro de diálogo y cancelar la descarga"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
@@ -10682,9 +10805,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:349
 msgid "Go back to step 1/3"
-msgstr ""
+msgstr "Regresar al paso 1/3"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:292
 msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
-msgstr ""
+msgstr "<html>Paso 3/3: Recuperado con éxito un token de acceso</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:306
@@ -10697,5 +10820,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:348
 msgid "Restart"
-msgstr ""
+msgstr "Reiniciar"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:371
@@ -10735,5 +10858,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
 msgid "Success"
-msgstr ""
+msgstr "Completado"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
@@ -10751,5 +10874,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:242
 msgid "Test failed"
-msgstr ""
+msgstr "Falló la prueba"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
@@ -10784,5 +10907,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
-#, fuzzy
 msgid ""
 "<html>The test failed because the server responded with an internal error."
@@ -10790,7 +10912,4 @@
 "</html>"
 msgstr ""
-"<html>El servidor OSM <br>''{0}''<br>informa de un error de servidor interno."
-"<br>Esto suele ser un problema temporal. Inténtelo de nuevo más tarde, por "
-"favor.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
@@ -10830,5 +10949,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Por favor, seleccione la fila a editar"
@@ -10842,5 +10961,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10997,9 +11116,4 @@
 msgstr "Estilo de representación {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "Capa: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -11029,6 +11143,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr "Todo"
@@ -11069,8 +11183,8 @@
 msgstr "Color único (puede ser personalizado desde las capas nombradas)"
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Coche"
@@ -11092,13 +11206,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Bicicleta"
@@ -11131,12 +11245,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "Pie"
@@ -11397,9 +11511,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
 msgid "Search:"
-msgstr ""
+msgstr "Buscar:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:119
 msgid "Enter a search expression"
-msgstr ""
+msgstr "Introducir una expresión de búsqueda"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:172
@@ -11431,9 +11545,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:296
 msgid "Download list"
-msgstr ""
+msgstr "Descargar lista"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:297
 msgid "Download the list of available plugins"
-msgstr ""
+msgstr "Descargar una lista de componentes disponibles"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:326
@@ -11449,13 +11563,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:327
 msgid "Update the selected plugins"
-msgstr ""
+msgstr "Actualizar los componentes seleccionados"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:379
 msgid "Configure sites..."
-msgstr ""
+msgstr "Configurar sitios..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:380
 msgid "Configure the list of sites where plugins are downloaded from"
-msgstr ""
+msgstr "Configurar la lista de sitios desde donde se descargar los componentes"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
@@ -11494,5 +11608,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
-#, fuzzy
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11508,15 +11621,4 @@
 "keyboard...</p>"
 msgstr ""
-"<p>Debe saber que la lista de selección de teclas de la siguiente página, "
-"enumera no solo las teclas que existen en su teclado, sino todas las teclas "
-"que existen en toda clase de teclados que Java conoce. Por favor use "
-"solamente las que corresponden a una tecla real de su teclado. Así que si su "
-"teclado no tiene la tecla 'Copy' no la use (los teclados de PC no la tienen, "
-"los teclados de Sun sí). Igualmente Habrá teclas que correspondan a un atajo "
-"o combinación de teclas (ej: \":\"/dos puntos). Por favor tampoco utilice "
-"éstas, es mejor usar la tecla base ( '.'/Punto en teclado español, ';'/Punto "
-"y coma en teclado americano ....). Si no se hace de esta manera se "
-"producirán conflictos, ya que JOSM no tiene manera de saber que [Ctrl + "
-"shift + . ] y [ Ctrl + : ] es lo mismo en un teclado español...</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
@@ -11666,5 +11768,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:118
 msgid "Download plugins"
-msgstr ""
+msgstr "Descargar componentes"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:150
@@ -11695,13 +11797,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
 msgid "Authentication"
-msgstr ""
+msgstr "Autentificación"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
 msgid "Proxy settings"
-msgstr ""
+msgstr "Configuraciones de proxy"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
 msgid "File backup"
-msgstr ""
+msgstr "Archivo de respaldo"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
@@ -11711,9 +11813,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
 msgid "Configure whether to use a proxy server"
-msgstr ""
+msgstr "Configurar si desea usar un servidor proxy"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
 msgid "Configure whether to create backup files"
-msgstr ""
+msgstr "Configurar si desea crear archivos de copia de seguridad"
 
 #. 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
@@ -11780,5 +11882,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:432
 msgid "Add a filename or an URL of an active style"
-msgstr ""
+msgstr "Añadir un nombre de archivo o una URL de un estilo activo"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:447
@@ -11788,5 +11890,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:468
 msgid "Edit the filename or URL for the selected active style"
-msgstr ""
+msgstr "Editar un nombre de archivo o una URL de un estilo activo"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490
@@ -11872,5 +11974,5 @@
 #, java-format
 msgid "{0}: Version {1} (local: {2})"
-msgstr ""
+msgstr "{0}: Versioón {1} (local: {2})"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
@@ -12071,5 +12173,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:179
 msgid "Host:"
-msgstr ""
+msgstr "Servidor:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:114
@@ -12077,5 +12179,5 @@
 msgctxt "server"
 msgid "Port:"
-msgstr ""
+msgstr "Puerto:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:126
@@ -12086,5 +12188,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:144
 msgid "Password:"
-msgstr ""
+msgstr "Contraseña:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
@@ -12115,4 +12217,7 @@
 "JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
 msgstr ""
+"Advertencia: JOSM está configurado para utilizar servidores proxy desde las "
+"preferencias del sistema, pero la JVM no está configurado para recuperarlos. "
+"Restablezca la preferencias a \"Sin proxy\"."
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
@@ -12137,5 +12242,12 @@
 msgstr "Borrar la selección en la tabla de etiquetas"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -12143,18 +12255,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "Atributos opcionales"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr "vía sin salida"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo desconocido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -12165,16 +12277,16 @@
 msgstr "No se pudo leer la fuente de las preferencias de etiquetas: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Error analizando {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, 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:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -12183,18 +12295,17 @@
 msgstr[1] "Modificar objetos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "¡No hay nada seleccionado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "¡Selección inadecuada!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "Aplicar"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Cambiar propiedades"
@@ -12203,26 +12314,26 @@
 #, java-format
 msgid "Preset group {1} / {0}"
-msgstr ""
+msgstr "Grupo predefinido {1} / {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java:26
 #, java-format
 msgid "Preset group {0}"
-msgstr ""
+msgstr "Grupo predefinido {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:71
 msgid "Min. latitude"
-msgstr ""
+msgstr "Latitud min."
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:73
 msgid "Min. longitude"
-msgstr ""
+msgstr "Longitud min."
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:75
 msgid "Max. latitude"
-msgstr ""
+msgstr "Latitud max."
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:77
 msgid "Max. longitude"
-msgstr ""
+msgstr "Longitud max."
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:87
@@ -12251,11 +12362,9 @@
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
 "capabilities. Got ''{2}''"
 msgstr ""
-"Valor ilegal para el atributo ''{0}'' en la etiqueta XML ''{1}''. Obtenido "
-"{2}."
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
@@ -12473,6 +12582,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12497,5 +12606,5 @@
 msgstr "Análisis sintáctivo fallido del archivo \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
@@ -12503,5 +12612,5 @@
 "documento gpx"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12510,14 +12619,13 @@
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:23
 msgid "Image Files"
-msgstr ""
+msgstr "Archivos de imagen"
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:23
 msgid "folder"
-msgstr ""
+msgstr "carpeta"
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
-#, fuzzy
 msgid "Looking for image files"
-msgstr "Buscando línea de costa..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
@@ -12525,8 +12633,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, fuzzy, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "Advertencia: falló la eliminación del componente obsoleto ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
@@ -12599,5 +12713,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "Coordenadas importadas: "
@@ -12698,9 +12812,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Subiendo {0} objetos..."
-msgstr[1] "Subiendo {0} objetos..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -13126,5 +13240,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:60
 msgid "Reading changesets..."
-msgstr ""
+msgstr "Leyendo conjunto de cambios..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:66
@@ -13146,11 +13260,11 @@
 msgid "Downloading {0} changeset ..."
 msgid_plural "Downloading {0} changesets ..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Descargando {0} conjunto de cambios..."
+msgstr[1] "Descargando {0} conjuntos de cambios..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:145
 #, java-format
 msgid "({0}/{1}) Downloading changeset {2} ..."
-msgstr ""
+msgstr "({0}/{1}) Descargando conjunto de cambios {2} ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:185
@@ -13238,9 +13352,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159
-#, fuzzy, java-format
+#, java-format
 msgid "({0}/{1}) Uploading {2} object..."
 msgid_plural "({0}/{1}) Uploading {2} objects..."
-msgstr[0] "Subiendo {0} objetos..."
-msgstr[1] "Subiendo {0} objetos..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
@@ -13326,7 +13440,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:194
-#, fuzzy
 msgid "Click to update the activated plugins"
-msgstr "Haga clic para cerrar el cuadro de diálogo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
@@ -13339,5 +13452,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -13346,9 +13459,5 @@
 "are:"
 msgstr[0] ""
-"El componente {1} requiere a su vex del componente {0} pero no se ha "
-"encontrado"
 msgstr[1] ""
-"El componente {1} requiere a su vex del componente {0} pero no se ha "
-"encontrado"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13372,14 +13481,14 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:373
 msgid "Loading plugins ..."
-msgstr ""
+msgstr "Cargando componentes..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:374
 msgid "Checking plugin preconditions..."
-msgstr ""
+msgstr "Comprobando requisitos previos del componente..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:401
 #, java-format
 msgid "Loading plugin ''{0}''..."
-msgstr ""
+msgstr "Cargando componente ''{0}''..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:482
@@ -13387,29 +13496,31 @@
 msgid_plural "JOSM could not find information about the following plugins:"
 msgstr[0] ""
+"JOSM no ha podido encontrar información sobre el componente siguiente:"
 msgstr[1] ""
+"JOSM no ha podido encontrar información sobre los componentes siguientes:"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:490
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "El componente no será cargado."
+msgstr[1] "Los componentes no serán cargados."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:516
 msgid "Determine plugins to load..."
-msgstr ""
+msgstr "Determinar los componentes a cargar ..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:522
 msgid "Removing deprecated plugins..."
-msgstr ""
+msgstr "Eliminando componentes obsoletos..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:524
 msgid "Removing umaintained plugins..."
-msgstr ""
+msgstr "Eliminando componentes sin mantenimiento..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:548
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "La actualización del siguiente componente ha fallado:"
+msgstr[1] "La actualización de los siguientes componentes ha fallado:"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:559
@@ -13425,5 +13536,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:567
 msgid "Plugin update failed"
-msgstr ""
+msgstr "Actualización del componente fallida"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:623
@@ -13434,7 +13545,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:625
-#, fuzzy, java-format
+#, java-format
 msgid "Click to delete the plugin ''{0}''"
-msgstr "Haga clic para cerrar el cuadro de diálogo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
@@ -13452,5 +13563,5 @@
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr ""
+msgstr "Advertencia: falló la eliminación del componente obsoleto ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:701
@@ -13461,4 +13572,7 @@
 "installation. JOSM still going to load the old plugin version."
 msgstr ""
+"Advertencia: no se puedo instalar el componente descargado ''{0}''. "
+"Omitiendo la instalación. JOSM cargará aún la versión obsoleta del "
+"componente."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:706
@@ -13470,7 +13584,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#, fuzzy, java-format
+#, java-format
 msgid "Click to disable the plugin ''{0}''"
-msgstr "Haga clic para cerrar el cuadro de diálogo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:731
@@ -13520,11 +13634,11 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:69
-#, fuzzy, java-format
+#, java-format
 msgid "The plugin file ''{0}'' does not include a Manifest."
-msgstr "El archivo \"{0} no existe"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:181
 msgid "More info..."
-msgstr ""
+msgstr "Más información..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginListParser.java:42
@@ -13537,5 +13651,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:46
 msgid "Reading local plugin information.."
-msgstr ""
+msgstr "Leyendo la información del componente local"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:80
@@ -13557,14 +13671,14 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:105
 msgid "Processing plugin files..."
-msgstr ""
+msgstr "Procesando archivos de componentes..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:48
 msgid "Download plugin list..."
-msgstr ""
+msgstr "Descargando lista de componentes..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:112
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
-msgstr ""
+msgstr "Descargando lista de componentes desde ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:163
@@ -13578,5 +13692,5 @@
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
-msgstr ""
+msgstr "Escribiendo la lista de componentes a la caché local ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:191
@@ -13584,4 +13698,5 @@
 msgid "Parsing plugin list from site ''{0}''"
 msgstr ""
+"Analizando sintáctivamente la lista de componentes desde el sitio ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:196
@@ -13596,5 +13711,5 @@
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
-msgstr ""
+msgstr "Procesando la lista de componentes desde el sitio ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:301
@@ -13617,5 +13732,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13623,8 +13737,4 @@
 "file a bug report."
 msgstr ""
-"Ha ocurrido una excepción imprevista.\n"
-"\n"
-"Esto es siempre un error de código. Si usted esta ejecutando la última\n"
-"versión de JOSM, por favor, considere enviar un informe de error."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13643,4 +13753,6 @@
 "bug report in our bugtracker using this link:"
 msgstr ""
+"Debería actualizar sus componentes. Si no existe ninguna ayuda, por favor un "
+"informe del error en nuestro bugtracker través de este enlace:"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:125
@@ -13663,5 +13775,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:151
 msgid "You have encountered a bug in JOSM"
-msgstr ""
+msgstr "Ha encontrado un error en JOSM"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:41
@@ -13726,6 +13838,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -13839,5 +13951,5 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:354
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
@@ -13845,6 +13957,4 @@
 "preferences and your internet connection.</html>"
 msgstr ""
-"<html>Fallo al abrir una conexión con el servidor remoto<br>''{0}''.<br>Por "
-"favor, compruebe su conexión de Internet.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:426
@@ -13863,6 +13973,6 @@
 "No se puede encontrar la traducción para el idioma {0}. Revertiendo a {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13871,5 +13981,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -14026,4 +14136,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr "Visibilidad"
@@ -14115,5 +14226,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "Interpolación de números de portales"
@@ -14725,5 +14836,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr "Localización"
@@ -14751,5 +14862,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:37
 msgid "PNG files (*.png)"
-msgstr ""
+msgstr "Archivos PNG (*.png)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionSaveRasterAs.java:45
@@ -14889,21 +15000,21 @@
 "Elimine el área de la relación antes de dividirlo."
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr "Archivos TangoGPS (*.log)"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr "Errores de formato: "
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr "Importación de TangoGPS realizada con éxito"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr "¡Importación de TangoGPS fallida!"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr "Archivos TCX (*.tcx)"
@@ -14935,9 +15046,9 @@
 msgstr "Crear un duplicado de la vía"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 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:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Convertir a capa GPX con tiempo anonimizado"
@@ -14952,13 +15063,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr "Importar recorrido desde la capa GPX"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr "Soltar camino existente"
@@ -14967,6 +15078,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr "No se encontró la capa de datos GPX"
@@ -15195,17 +15306,17 @@
 msgstr "Cargar el conjunto de imágenes como una nueva capa."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr "No se encuentra la dirección indexada '{0}'"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr "La localización inicial no está dentro de la bbox"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:105
 msgid "Looking for shoreline..."
 msgstr "Buscando línea de costa..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -15249,42 +15360,41 @@
 msgstr "Eliminando nodos duplicados..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr "Traza Lakewalker"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr "A ocurrido un error desconocido"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "este"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "noreste"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "norte"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "noroeste"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "oeste"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "suroeste"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "sur"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "sureste"
@@ -15340,6 +15450,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -15348,74 +15458,74 @@
 msgstr "lámina de agua"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "línea de costa"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "tierra"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Maximum number of segments per way"
 msgstr "Máximo número de sergmento por vía"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
 msgid "Maximum number of nodes in initial trace"
 msgstr "Máximo nudo de nodos en un trazo inicial"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Valor máximo de gris par aque cuente como agua (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
 msgid "Line simplification accuracy (degrees)"
 msgstr "Precisión en la simplificación de línea (grados)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Resolución de las teselas del Landsat (píxeles por grado)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Tamaño de las teselas del Landsat (píxeles)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
 msgid "Shift all traces to east (degrees)"
 msgstr "Dirigir todas las trazas hacia el Este (grados)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
 msgid "Shift all traces to north (degrees)"
 msgstr "Dirigir todas las trazas hacia el Norte (grados)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
 msgid "Direction to search for land"
 msgstr "Dirección para buscar por la tierra"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
 msgid "Tag ways as"
 msgstr "Etiquetar vías como"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr "Capa WMS"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr "Tamaño máximo del caché (Mb)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
 msgid "Maximum cache age (days)"
 msgstr "Antigüedad máxima del caché (días)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:68
 msgid "Source text"
 msgstr "Texto sobre la fuente"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Máximo numero de segmentos permitidos en cada vía generada. Por Defecto 250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -15425,5 +15535,5 @@
 "Por defecto 50000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -15433,5 +15543,5 @@
 "1). Puede estar entre el rango 0-255. Por defecto 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -15442,5 +15552,5 @@
 "0,0003 por defecto."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -15449,55 +15559,55 @@
 "4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Tamaño de una tesela Landsat, medido  en píxeles. Por defecto 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Trasladar todos los puntos en dirección Este (por defecto 0 grados)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Trasladar todos los puntos en dirección Norte (por defecto 0 grados)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Direction to search for land. Default east."
 msgstr "Búsqueda de dirección en la tierra (por defecto Este)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr "Etiquetar vías como agua, costa, tierra o nada. Por defecto es agua."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "Capa de WMS desde la que trazar. Por defecto IR1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "Tamaño máximo de cada directorio cache in bytes. Por defecto 300 MB."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 "Edad máxima en días de cada archivo en caché. El valor por defecto es 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr "Texto sobre la fuente de datos. Por defecto es Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 "Un componente para localizar las láminas de agua en las imágenes Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr "Preferecnias de Lakewalker Plugin"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:50
 msgid "Downloading image tile..."
 msgstr "Descargando tesela de la imagen..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr "No se a podido adquirir la imagen"
@@ -15521,5 +15631,5 @@
 msgstr "Falló la conexión"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr "sin nombre"
@@ -15550,5 +15660,5 @@
 msgstr "Recorrido"
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr "Capa LiveGPS"
@@ -15624,5 +15734,5 @@
 msgstr "Ángulo entre dos nodos seleccionados"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr "Capa para mediciones"
@@ -15748,5 +15858,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
 msgid "Process queue"
-msgstr ""
+msgstr "Procesando cola"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
@@ -15761,5 +15871,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
 msgid "Bug list"
-msgstr ""
+msgstr "Lista de errores"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -15773,18 +15883,18 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:177
 msgid "Queue"
-msgstr ""
+msgstr "Cola"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:412
 msgid "offline"
-msgstr ""
+msgstr "desconectado"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:412
 msgid "online"
-msgstr ""
+msgstr "conectado"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:412
 #, java-format
 msgid "OpenStreetBugs ({0})"
-msgstr ""
+msgstr "OpenStreetBugs ({0})"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:57
@@ -15799,5 +15909,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/AddCommentAction.java:89
 msgid "Comment: "
-msgstr ""
+msgstr "Comentario: "
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:59
@@ -15819,5 +15929,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
 msgid "Close: "
-msgstr ""
+msgstr "Cerrar: "
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
@@ -15836,5 +15946,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
 msgid "Create: "
-msgstr ""
+msgstr "Crear: "
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
@@ -15848,9 +15958,9 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
 msgid "Switch to online mode"
-msgstr ""
+msgstr "Cambiar al modo en línea"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
 msgid "Switch to offline mode"
-msgstr ""
+msgstr "Cambiar a modo desconectado"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
@@ -15860,5 +15970,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
 msgid "OpenStreetBugs"
-msgstr ""
+msgstr "OpenStreetBugs"
 
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:48
@@ -15896,4 +16006,76 @@
 msgid "Firefox executable"
 msgstr "Ejecutable Firefox"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#, fuzzy
+msgid "Read error!"
+msgstr "Embalse"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Introduzca las coordenadas para el nuevo nodo."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Conservar archivos de copia de seguridad"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Error"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "La hora no pudo ser analizada sintácticamente."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "No se puede reombrar el archivo ''{0}''"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Conservar archivos de copia de seguridad"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "Conservar archivos de copia de seguridad"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Sobrescribir"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+#, fuzzy
+msgid "Could not delete temporary file!"
+msgstr "No se pudo encontrar el tipo de elemento"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
@@ -16170,6 +16352,6 @@
 msgstr "Grabar datos capturados cada minuto."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -16297,73 +16479,132 @@
 "preferencias."
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+#, fuzzy
+msgid "Terrace a house"
+msgstr "Adosar un edificio"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+msgid "Interpolation"
+msgstr "Interpolación"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr "Segmentos"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Calles/Carreteras"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Mayor número"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Menor número"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+#, fuzzy
+msgid "Lowest housenumber of the terraced house"
+msgstr ""
+"El número de portal inferior no puede ser superior que número de portal mayor"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Crear un anueva relación"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Eliminar vías duplicadas"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Nombre de la calle"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr "Par/Impar"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr "Menor número"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr "Mayor número"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr "Segmentos"
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 "El número de portal inferior no puede ser superior que número de portal mayor"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr "Los números de portal no coinciden con la configuración par/impar"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr "El segmento debe ser un número mayor que 1"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+msgstr "{0} no es un número"
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr "Invertir edificios adosados"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr "Invertir los números de portal de edificios adosados"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr "Invertir edificios adosados"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:83
+#, fuzzy
+msgid "Cannot reverse!"
+msgstr "no presente"
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:125
 msgid "Reverse Terrace"
 msgstr "Invertir edificios adosados"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr "Adosar un edificio"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr "Crear edificios individuales a partir de un gran edificio."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr "Seleccione una vía cerrada de al menos cuatro puntos."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr "Edificios entre medianeras"
@@ -16603,5 +16844,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr "Nodos duplicados"
@@ -16611,5 +16852,5 @@
 msgstr "Esta examen comprueba que no haya nodos en el mismo lugar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16621,9 +16862,9 @@
 "usándolos.<br>¿Esta seguro que quiere borrarlo?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr "Confirmación"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr "Nodos en la misma posición"
@@ -16660,5 +16901,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr "Multipolígono"
@@ -16666,21 +16907,21 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:26
 msgid "This test checks if multipolygons are valid"
-msgstr ""
+msgstr "Este test analiza si los multipolígonos son válidos"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:38
 msgid "Multipolygon is not closed"
-msgstr ""
+msgstr "El multipolígono no está cerrado"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:42
 msgid "No outer way for multipolygon"
-msgstr ""
+msgstr "Ninguna vía exterior para el multipolígono"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:54
 msgid "Multipolygon inner way is outside."
-msgstr ""
+msgstr "La vía interior del multipolígono está fuera"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:56
 msgid "Intersection between multipolygon ways"
-msgstr ""
+msgstr "Intersección entre vías multipolígono"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:66
@@ -16817,7 +17058,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr "Combinaciones incorrectas de etiquetas y/o valores"
@@ -16825,61 +17066,61 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr "Problema al dibujar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Clave ''{0}'' no válida."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr "Etiquetas con valores vacíos"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr "Clave de propiedad no válida"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr "Espacio en blanco no válido en la clave de propiedad"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr ""
 "Los valores de la propiedad empiezan y terminan con un espacio en blanco"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr "Los valores de propiedad contienen entidad de HTML"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "La clave ''{0}\" no existe en los predefinidos"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr "Esta clave no está predefinida"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "El valor \"{0}\" para la clave \"{1}\" no está en los predefinidos."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr "Los predefinidos no contiene valores apropiados"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr "Comprobar las propiedades de las claves"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
@@ -16887,21 +17128,21 @@
 "comprobación de las palabras."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr "Usar analizador de propiedad compleja."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr "Validar valores de propiedad y etiquetas que usan reglas complejas"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr "Fuente de test de etiquetas"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16912,25 +17153,25 @@
 "del corrector de etiquetas."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr "Agregar nueva fuente a la lista."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr "Editar la fuente seleccionada."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "Borrar la fuente seleccionada de la lista."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "Fuentes de datos"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr "Analizar propiedades de los valores."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
@@ -16938,62 +17179,62 @@
 "los predefinidos."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr "Comprobar FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Buscar nodos o viales con FIXME en cualquier propiedad de valor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr "Compruebar el registro de notas."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr "Analizar si el mapa creado contiene errores en los datos."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr "Usar datos de archivo por defecto."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr "Usar datos de archivo por defecto (recomendado)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr "Ignorar el uso de etiquetas de archivos por defecto."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr "Utilizar  etiquetas de archivos por defecto (recomendado)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr "Utilizar el corrector ortográfico por defecto."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Utilizar el corrector ortográfico por defecto (recomendado)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr "Fijar las propiedades"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr "No se pudo encontrar el tipo de elemento"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr "No se pudo encontrar el nivel de alerta"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Expresión ilegal ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -17325,5 +17566,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
 msgid "Not in cache"
-msgstr ""
+msgstr "No en caché"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67
@@ -17458,5 +17699,5 @@
 msgstr "Capa WMS ({0}), descargando en zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -17471,13 +17712,17 @@
 "teselas WMS de todos modos?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr "Sí, descargar las imágenes"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr "¿URL no válida?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+msgid "Download visible tiles"
+msgstr "Descargar las teselas visibles"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -17486,50 +17731,46 @@
 "más, o cambie la resolución"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
-msgid "Download visible tiles"
-msgstr "Descargar las teselas visibles"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "Cambiar resolución"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr "Recargar teselas erróneas"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr "Canal alfa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "Guardar capa WMS como archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr "Salvar capa WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "Cargar capa WMS desde archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr "Cargar capa WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, 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:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr "Error en el formato del archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "Error al leer el archivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr "Fijar marcador WMS"
@@ -17826,6 +18067,13 @@
 "SVG."
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17836,15 +18084,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "El gran JGoodies Plastic Look and Feel."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr "Dejar que otras aplicaciones envíen comandos a JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17856,10 +18104,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr "Proporciona capacidades de enrutamiento."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17870,10 +18118,10 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permite añadir marcadores/nodos a las posiciones GPS actual."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
@@ -17882,5 +18130,5 @@
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17894,10 +18142,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr "Crea edificios entremedianeras a partir de bloques únicos"
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17909,5 +18157,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17918,5 +18166,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -17924,5 +18172,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -18031,6 +18279,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -18038,6 +18295,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "Referencia"
@@ -18054,5 +18312,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Carriles"
@@ -18074,10 +18332,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Velocidad max. (km/h)"
@@ -18121,14 +18379,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "Sentido único"
@@ -18171,13 +18429,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -18215,13 +18473,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Túnel"
@@ -18256,13 +18514,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "Desmonte"
@@ -18297,13 +18555,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "Terraplén"
@@ -18435,4 +18693,13 @@
 msgid "Edit Unclassified Road"
 msgstr "Editar carretera sin clasificación"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr ""
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -18450,15 +18717,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr "Anchura (metros)"
@@ -18470,5 +18737,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Calle urbana"
@@ -18477,5 +18744,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "Editar calle urbana"
@@ -18493,16 +18760,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Superficie"
@@ -18524,166 +18794,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr "pavimentada"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr "sin pavimentar"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr "asfalto"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr "hormigón"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr "metal"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "bosque"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr "pavimento adoquinado"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr "adoquinado"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "grava"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr "grijo"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr "compactado"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr "Pavimento vegetal (de celosía)"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "hierba"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "arena"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr "tierra"
@@ -18691,5 +18968,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr "Calle residencial"
@@ -18698,5 +18975,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr "Editar calle residencial"
@@ -18704,5 +18981,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "Calle peatonal"
@@ -18711,5 +18988,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "Editar una vía peatonal"
@@ -18717,5 +18994,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr "Vía de servicio"
@@ -18724,5 +19001,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr "Editar vía de servicio"
@@ -18732,18 +19009,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr "Tipo de vía de servicio"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr "callejón"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr "camino de entrada (a garage, casa, finca, etc.)"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr "pasillo de aparcamiento"
@@ -18751,5 +19028,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr "Pasillo de aparcamiento"
@@ -18759,5 +19036,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr "Editar pasillo de aparcamiento"
@@ -18765,5 +19042,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "Carretera (tipología desconocida)"
@@ -18772,5 +19049,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "Editar carretera (tipología desconocida)"
@@ -18779,20 +19056,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "Restricciones de tráfico"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "Editar restricciones de tráfico"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "Peaje"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "Sin salida (cul-de-sac)"
@@ -18800,9 +19077,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 msgid "Access"
 msgstr "Acceso"
 
 #. 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"
@@ -18813,6 +19091,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18824,4 +19100,5 @@
 #. 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"
@@ -18840,141 +19117,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+msgid "yes"
+msgstr "sí"
+
+#. 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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "privado"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+msgstr "autorizado"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:219
+msgid "destination"
+msgstr "destino"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr "permisivo"
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr "agrícola"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-msgid "yes"
-msgstr "sí"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "privado"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-msgstr "autorizado"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "destino"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr "permisivo"
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr "agrícola"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "no"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr "Mercancías"
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Vehículos pesados (> 6 t.)"
@@ -18989,10 +19274,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr "Caballo"
@@ -19008,10 +19293,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "Motocicleta"
@@ -19026,27 +19311,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr "Automóvil"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr "Vehículos de servicio público (SP)"
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr "Embarcación a motor"
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "Barco"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Velocidad mínima (km/h)"
@@ -19054,25 +19331,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "Peso máximo (t)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr "Altura max. (en metros)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr "Anchura max. (en metros)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr "Longitud max. (en metros)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "Rotonda"
@@ -19083,5 +19360,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "Editar una intersección"
@@ -19101,10 +19378,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "Autopista"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr "Acceso a autopista"
@@ -19126,10 +19403,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "Carretera principal"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr "Enlace a carretera principal"
@@ -19151,10 +19428,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "vía primaria"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr "acceso a vía primaria"
@@ -19176,5 +19453,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -19189,9 +19466,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "carretera local"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr "carretera sin clasificación"
@@ -19205,9 +19482,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "calle urbana"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr "calle residencial"
@@ -19237,10 +19514,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "vía de servicio"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr "carril bus guiado"
@@ -19270,5 +19547,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -19280,10 +19557,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Editar un puente"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr "Editar túnel"
@@ -19291,19 +19568,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Vías"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "En construcción"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "Editar una vía en construcción"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "Intersección"
@@ -19319,5 +19596,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "rotonda"
@@ -19325,5 +19602,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr "Pista"
@@ -19332,40 +19609,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr "Editar una pista"
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "Pista"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "grava"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "grava"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "grava"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "grava"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "grava"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr ""
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -19373,5 +19644,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -19379,37 +19650,32 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr "senderismo"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "Bicicleta de montaña"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
-msgstr "Sendero de montaña exigente"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
-msgstr "Sendero alpino"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
-msgstr "Sendero alpino exigente"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
-msgstr "Sendero alpino difícil"
+msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "Camino (genérico, sin uso específico)"
@@ -19418,12 +19684,32 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "Editar camino"
 
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr "intermedio"
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
+
 #: build/trans_presets.java:489
-#, fuzzy
 msgid "Wheelchairs"
-msgstr "Silla de ruedas"
+msgstr ""
 
 #: build/trans_presets.java:490
@@ -19439,7 +19725,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "Editar vía ecuestre"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -19452,7 +19737,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "Editar vía ciclable"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -19487,24 +19771,21 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "Combinar de todos modos"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "Editar vía peatonal"
+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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Editar vía peatonal"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr "Bicicletas"
@@ -19512,5 +19793,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "Escaleras"
@@ -19520,5 +19801,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Editar tramo de escaleras"
@@ -19526,10 +19807,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr "Nodos de Vía"
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "Salida de autopista"
@@ -19537,15 +19818,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "Editar salida de autopista"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "Número"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "Servicios"
@@ -19553,5 +19834,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr "Editar estación de servicio"
@@ -19559,5 +19840,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -19590,17 +19872,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "Operador"
@@ -19609,5 +19891,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "Semáforo"
@@ -19617,5 +19899,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr "Tipo de cruce peatonal"
@@ -19624,27 +19906,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr "sin supervisión"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr "semáforos"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "isla"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr "sin marcar"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr "Cruce de caballos"
@@ -19652,6 +19934,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr "Cruce de bicicletas"
@@ -19660,11 +19942,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr "Guarda cruces"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr "Tipo de nombre de cruce (Reino Unido)"
@@ -19672,30 +19954,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr "cebra"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr "pelícano"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr "tucán"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr "frailecillo"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr "pegaso"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr "tigre"
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "Stop"
@@ -19703,5 +19985,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr "Paso peatonal"
@@ -19710,14 +19992,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr "Editar cruce"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr "Tipo de nombre (Reino Unido)"
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr "mini-rotonda"
@@ -19728,14 +20056,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr "Dirección"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr "agujas del reloj"
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr "Círculo de giro"
@@ -19745,26 +20073,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "Límite de ciudad"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "Editar la señal de límite de ciudad"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr "Nombre alternativo"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 msgid "Speed Camera"
 msgstr "Radar de tráfico"
 
 #. 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "Teléfono de emergencia"
@@ -19772,5 +20102,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr "Pendiente"
@@ -19778,5 +20108,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr "Pendiente pronunciada"
@@ -19784,11 +20114,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr "Vado"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr "Editar vado"
@@ -19796,5 +20133,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr "Puerto de montaña"
@@ -19802,5 +20139,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr "Editar puerto de montaña"
@@ -19812,7 +20149,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "Altitud"
@@ -19820,5 +20157,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Barreras"
@@ -19826,5 +20163,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr "Bolardo"
@@ -19832,5 +20169,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr "Editar un bolardo"
@@ -19875,16 +20212,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "Tráfico permitido:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr "Barrera para bicicletas"
@@ -19893,5 +20230,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr "Bloques"
@@ -19899,5 +20236,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr "Barrera canadiense"
@@ -19905,10 +20242,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr "Editar barrera canadiense"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr "Trampa para coches"
@@ -19916,15 +20253,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr "Pinchos"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr "Editar pinchos"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "Cabina de peaje"
@@ -19932,5 +20269,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "Editar cabina de peaje"
@@ -19938,10 +20275,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr "Aduana"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr "Editar aduana"
@@ -19951,5 +20288,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr "Seto"
@@ -19958,12 +20295,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:817 build/trans_presets.java:819
 msgid "Fence"
 msgstr "Valla o cerca"
 
-#. item "Barriers/Fence"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "Muro"
@@ -19971,5 +20320,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "Muralla"
@@ -19978,5 +20327,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr "Muro de contención"
@@ -19988,15 +20337,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr "Entrada"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr "Editar una entrada"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "Puerta"
@@ -20004,50 +20354,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr "Editar puerta"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr "Barrera"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr "Editar una barrera"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr "Portilla de malla metálica"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr "Editar portilla de malla metálica"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr "Banda reductora de velocidad"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr "Editar banda reductora de velocidad"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr "Portilla giratoria"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr "Editar portilla giratoria"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr "Escalera de paso"
@@ -20055,25 +20405,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr "Editar una escalera de paso"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr "Torno"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr "Editar torno"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr "Poterna"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr "Editar poterna"
@@ -20084,11 +20434,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "Lámina de agua"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "Fuente"
@@ -20096,5 +20446,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "Editar fuente"
@@ -20102,5 +20452,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr "Desagüe"
@@ -20108,10 +20458,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr "Editar canal de desagüe"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "Riachuelo"
@@ -20119,10 +20480,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "editar un riachuelo"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "Canal"
@@ -20130,10 +20491,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "Editar un canal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "Río"
@@ -20143,5 +20504,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "Editar un río"
@@ -20149,15 +20510,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Editar lámina de agua"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "Suelo"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "Editar suelo"
@@ -20165,15 +20526,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr "Cuenca"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr "Editar cuenca"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr "Embalse"
@@ -20181,15 +20542,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr "Editar embalse"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr "Depósito de agua"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr "Editar depósito de agua"
@@ -20197,5 +20558,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "Ribera (para orillas de ríos anchos)"
@@ -20204,10 +20565,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "Editar ribera"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr "Pantano"
@@ -20218,14 +20579,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr "Editar pantano"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "Ciénaga"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr "ciénaga"
@@ -20239,35 +20600,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr "marísma"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr "juncal"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr "saladar"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr "superficie mareal"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr "manglar"
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "Lodazal"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr "Editar lodazal"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "Playa"
@@ -20275,20 +20636,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "Editar playa"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "Bahía"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "Editar bahía"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "Acantilado"
@@ -20296,10 +20657,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "Editar acantilado"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "Línea de costa"
@@ -20307,5 +20668,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "Editar línea de costa"
@@ -20313,5 +20674,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "Ruta de ferry"
@@ -20319,5 +20680,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr "Editar una ruta de ferry"
@@ -20326,5 +20687,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr "Astillero"
@@ -20332,10 +20693,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr "Editar un astillero"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "Muelle"
@@ -20343,5 +20704,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr "Editar un muelle"
@@ -20349,5 +20710,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "Presa"
@@ -20355,15 +20716,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "Editar una presa"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr "Nodo en vía fluvial"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr "Esclusa"
@@ -20372,5 +20733,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr "Represa"
@@ -20378,20 +20739,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr "Editar una represa"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "Cascada"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "Editar una cascada"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr "Ensanche para giro"
@@ -20400,15 +20761,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr "Puerto deportivo"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr "Editar puerto deportivo"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "Embarcadero"
@@ -20416,10 +20777,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "Editar embarcadero"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr "Terminal de ferry"
@@ -20427,10 +20788,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr "Editar la terminal de ferry"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr "Rampa"
@@ -20440,20 +20801,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr "Editar rampa"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr "Transporte"
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "Ferrocarril"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "Vía de tren"
@@ -20461,5 +20822,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr "Ediar vía de tren"
@@ -20468,139 +20829,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr "estándar"
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr "yarda"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr "vía muerta"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr "ramal"
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr "ferrocarril"
+
+#. 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:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+msgid "Voltage"
+msgstr "Voltaje"
+
+#. 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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr "Vía estrecha"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr "Editar vía estrecha"
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr "Monoraíl"
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr "Editar monoraíl"
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr "Vía para tren histórico"
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr "Editar vía para tren histórico"
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr "Metro ligero"
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr "Editar metro ligero"
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "Metro"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "Editar metro"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "Tranvía"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr "Editar tranvía"
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr "Vía para autobús guiado"
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr "Editar vía para autobús guiado"
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "Vía de tren en desuso"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "Editar vía de tren en desuso"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr "Tipos opcionales"
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr "yarda"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr "vía muerta"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr "ramal"
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr "Vía estrecha"
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr "Editar vía estrecha"
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr "Monoraíl"
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr "Editar monoraíl"
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr "Vía para tren histórico"
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr "Editar vía para tren histórico"
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr "Metro ligero"
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr "Editar metro ligero"
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "Metro"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "Editar metro"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "Tranvía"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr "Editar tranvía"
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr "Vía para autobús guiado"
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr "Editar vía para autobús guiado"
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "Vía de tren en desuso"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "Editar vía de tren en desuso"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "Vía de tren abandonada"
@@ -20609,5 +21209,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr "Paso a nivel"
@@ -20616,5 +21216,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr "Paso a nivel peatonal"
@@ -20624,5 +21224,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr "Tipo de paso"
@@ -20630,5 +21230,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "Plataforma de giro"
@@ -20637,10 +21237,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr "Remonte"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "Telesilla"
@@ -20648,10 +21255,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr "Editar telesilla"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr "Telearrastre"
@@ -20659,10 +21266,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr "Editar telearrastre"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "Telecabina"
@@ -20670,10 +21277,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "Ediatr telecabina"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr "Góndola"
@@ -20681,10 +21288,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr "Editar góndola"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20692,12 +21299,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr "Editar Estación"
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "Gasolinera"
@@ -20707,9 +21327,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Ediatr gasolinera"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20763,32 +21440,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "Horario de apertura"
@@ -20847,94 +21524,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lu-Vie 08:30-20:00"
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00"
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20946,5 +21699,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20954,5 +21707,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Editar aparcamiento"
@@ -20963,25 +21716,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr "Número de referencia"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "de pisos"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "al aire libre"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr "subterráneo"
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr "Park and Ride"
@@ -20990,48 +21743,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "De pago"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr "Capacidad (en general)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr "Plazas para Personas de Movilidad Reducida"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr "Espacios para la mujer"
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr "Espacios para padres"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Ver en la Wiki para otra capacidad: [types]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "Limpieza"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "Editar lavado de vehículos"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "Taller"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "Editar reparación de automóviles"
@@ -21039,5 +21792,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "Alquiler"
@@ -21046,10 +21799,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "Editar alquiler de automóviles"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr "Compartido"
@@ -21057,5 +21810,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr "Editar automóviles compartidos"
@@ -21063,10 +21816,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "Editar aparcamiento para bicicletas"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr "Capacidad (Coches)"
@@ -21075,15 +21828,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "Editar alquiler de bicicletas"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Transporte público"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -21093,5 +21846,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -21099,5 +21852,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr "UIC-Referencia"
@@ -21105,5 +21858,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr "Apeadero de ferrocarril"
@@ -21111,5 +21864,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr "Editar apeadero"
@@ -21117,5 +21870,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "Parada de tranvía"
@@ -21124,5 +21877,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "Editar parada de tranvía"
@@ -21130,5 +21883,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "Andén de ferrocarril"
@@ -21137,5 +21890,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "Editar andén de ferrocarril"
@@ -21147,5 +21900,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr "Referencia (número de pista)"
@@ -21153,10 +21906,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr "Área"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "Boca de metro"
@@ -21165,10 +21918,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "Editar boca de metro"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr "Silla de ruedas"
@@ -21177,5 +21930,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "Estación de autobús"
@@ -21184,5 +21937,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "Editar estación de autobús"
@@ -21190,5 +21943,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "Parada de autobús"
@@ -21198,5 +21951,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "Editar parada de autobús"
@@ -21205,25 +21958,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr "Refugio"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "Banco"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr "Pavimento táctil"
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr "Andén de autobús"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr "Editar andén de autobús"
@@ -21231,5 +21985,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "Taxi"
@@ -21237,5 +21991,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "Editar parada de taxi"
@@ -21243,32 +21997,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "Aeropuerto"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr "Editar Aeropuerto"
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr "IATA"
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr "ICAO"
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+msgid "Beacon"
+msgstr "Baliza"
+
+#. 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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr "Turismo"
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Alojamiento"
@@ -21280,5 +22129,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -21287,15 +22136,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "Editar hotel"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "Estrellas"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr "Motel"
@@ -21303,20 +22152,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr "Editar motel"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr "Pensión"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr "Editar pensión"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "Cabaña o bungalow"
@@ -21324,10 +22173,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr "Editar cabaña o bungalow"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr "Albergue"
@@ -21335,30 +22184,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr "Editar albergue"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr "Cabaña alpina"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr "Editar cabaña alpina"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr "Zona de caravanas"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr "Editar zona de caravanas"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "Lugar de acampada"
@@ -21366,10 +22215,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr "Editar lugar de acampada"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Comida+Bebidas"
@@ -21380,5 +22229,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurante"
@@ -21386,5 +22235,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "Editar restaurante"
@@ -21392,5 +22241,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr "Cocina"
@@ -21398,61 +22247,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "italiano"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "chino"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "pizzería"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "hamburguesería"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "griego"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "alemán"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "india"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "turco"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "asiático"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "tailandés"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "mexicano"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "japonés"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "Establecimiento de comida rápida"
@@ -21460,9 +22321,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "Editar establecimiento de comida rápida"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "Cafetería"
@@ -21470,9 +22339,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "Editar cafetería"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "Pub"
@@ -21480,18 +22349,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "Editar pub"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr "Editar biergarten"
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr "Bar"
@@ -21499,9 +22368,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr "Editar Bar"
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "Club nocturno"
@@ -21509,24 +22378,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "Editar club nocturno"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr "Atracción"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr "Editar atracción"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Museo"
@@ -21534,9 +22403,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Editar museo"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Zoo"
@@ -21545,9 +22414,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Editar zoo"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "Panorámica"
@@ -21555,24 +22424,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "Editar panorámica"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr "Torre de vigía"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "Parque temático"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr "Editar parque temático"
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "Trabajo artístico"
@@ -21580,5 +22449,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "Editar trabajo artístico"
@@ -21586,19 +22455,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr "Oficina de información"
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr "Grado de detalle"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr "topográfico"
@@ -21636,5 +22505,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -21642,28 +22511,28 @@
 msgstr "calle"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr "esquema"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr "Mostrar área"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr "sitio"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr "ciudad"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr "región"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr "Descripción detallada"
@@ -21673,5 +22542,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr "Rutas mostradas para:"
@@ -21679,5 +22548,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr "Sendero"
@@ -21685,6 +22554,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -21692,5 +22561,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr "Bicicleta de montaña"
@@ -21698,6 +22567,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "Esquí"
@@ -21705,5 +22574,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr "Equitación"
@@ -21711,46 +22580,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr "... otros modos de desplazamiento posible"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr "Panel informativo"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr "Tablón de anuncios"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr "aviso"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr "naturaleza"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr "vida salvaje"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr "plantas"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr "Poste indicador"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr "Punto de información"
@@ -21758,29 +22627,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr "Descripción detallada"
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr "Audioguía"
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr "¿Audioguía a través de telefono móvil?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr "Número de teléfono"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr "Otros Puntos de Información"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr "Editar refugio"
@@ -21788,25 +22657,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr "Barbacoa"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "Zona de picnic"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "Editar zona de picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Lugares históricos"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Castillo"
@@ -21815,19 +22684,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Editar castillo"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Ruinas"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Editar ruinas"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Lugar arqueológico"
@@ -21836,9 +22705,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "Editar lugar arqueológico"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "Campo de batalla"
@@ -21846,10 +22715,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "Editar campo de batalla"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr "Sitio paleontológico"
@@ -21857,5 +22726,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr "Editar sitio paleontológico"
@@ -21863,15 +22732,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "Editar monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "Monumento conmemorativo"
@@ -21879,55 +22748,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "Editar monumento conmemorativo"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr "Crucero"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr "Editar crucero"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr "Humilladero"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr "Editar humilladero"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr "Mojón"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr "Editar mojón"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Ocio"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "Parque acuático"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "Editar parque acuático"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Zona de juegos"
@@ -21935,35 +22804,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Editar zona de juegos"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Pesca"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "Editando pesca"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr "Deportes"
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr "Instalaciones deportivas"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Estadio"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Editar estadio"
@@ -21977,6 +22846,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "seleccionar deporte:"
@@ -22368,6 +23237,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -22401,225 +23270,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr "diversos"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "tiro con arco"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr "atletismo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "fútbol australiano"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "béisbol"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "baloncesto"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr "bolos"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr "piragua"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "escalada"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr "Cricket con redes"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr "carrera de perros"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr "hípica"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "fútbol"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "gimnasia"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr "carrera de caballos"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr "pelota vasca"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr "raqueta"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr "monopatín"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr "patinaje"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "esquí"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "Fútbol"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "natación"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "tenis de mesa"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "Polideportivo"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "Editar polideportivo"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr "Campo de juego"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr "Editar campo de juego"
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr "Pista de carreras"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr "Editar pista de carreras"
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "Campo de golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "Editar campo de golf"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "Editar mini golf"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Deporte"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr "Editar multi"
@@ -22658,21 +23527,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "tipo"
@@ -22711,203 +23580,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr "campo de juego"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "Polideportivo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "Estadio"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr "pista"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr "Editar bowling"
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr "Atletismo"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr "Editar atletismo"
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "Tiro con arco"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "Editar tiro con arco"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "Alpinismo"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "Editar alpinismo"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr "Piragüismo"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr "Editar piragüismo"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr "Editar ciclismo"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "Carreras de perros"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr "Editar carreras de perros"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr "Hípica"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr "Editar hípica"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr "Carreras de caballos"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr "Editar carreras de caballos"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "Gimnasia"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr "Editar gimnasia"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "Deportes de motor"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr "Editar deportes de motor"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr "Patinaje"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr "Editar patinaje"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr "Monopatín"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr "Editar monopatín"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "Natación"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "Editar natación"
@@ -22915,56 +23784,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr "Editar esquí"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr "Tipo de pista de esquí"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr "de descenso"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr "nórdico"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr "parque de snowboard"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr "Dificultad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr "novato"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr "fácil"
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr "intermedio"
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr "avanzado"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr "experto"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr "fuera de pista"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "Tiro"
@@ -22972,182 +23837,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "Editar tiro"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "Deporte (Pelota)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "Fútbol"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr "Editar fútbol"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "Fútbol americano"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr "Editar fútbol americano"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr "Fútbol australiano"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr "Editar fútbol australiano"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "Béisbol"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr "Editar béisbol"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "Baloncesto"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "Editar baloncesto"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr "Editar golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "campo de golf"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr "Editar boule"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr "Bolos"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr "Editar bolos"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr "Edit cricket"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr "Cricket con redes"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr "Editar cricket con redes"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr "Editar croquet"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "Editar hockey"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr "Pelota vasca"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr "Editar pelota vasca"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr "Raqueta"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr "Editar raqueta"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr "Editar rugby"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "Ping-pong"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "Editar ping-pong"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "Editar tenis"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr "Artificial"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Edificios"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "Edificio"
@@ -23155,5 +24020,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Edificio público"
@@ -23161,10 +24026,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Editar edificio público"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "Ayuntamiento"
@@ -23172,10 +24037,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Editar ayuntamiento"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Embajada"
@@ -23183,10 +24048,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Editar embajada"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "Juzgado"
@@ -23195,10 +24060,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Editar juzgado"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Prisión"
@@ -23207,10 +24072,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Editar prisión"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Policía"
@@ -23220,10 +24085,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Editar policía"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "Parque de bomberos"
@@ -23232,10 +24097,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Editar parque de bomberos"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Oficina postal"
@@ -23243,5 +24108,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Editar oficina postal"
@@ -23249,15 +24114,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "Jardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "Editar jardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "Escuela"
@@ -23265,10 +24130,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "Editar escuela"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "Universidad"
@@ -23276,10 +24141,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "Editar universidad"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "Instituto de enseñanza secundaria"
@@ -23287,5 +24152,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "Editar instituto de enseñanza secundaria"
@@ -23293,5 +24158,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Cine"
@@ -23300,10 +24165,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Editar cine"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "Biblioteca"
@@ -23312,9 +24177,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Editar biblioteca"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "Centro de arte"
@@ -23322,10 +24187,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "Editar centro de arte"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Teatro"
@@ -23334,10 +24199,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Editar teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "Lugar de culto"
@@ -23347,5 +24212,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "Editar lugar de culto"
@@ -23354,6 +24219,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "Religión"
@@ -23362,66 +24227,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr "bahaísta"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "budista"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "cristiana"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "hindú"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr "jainista"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "judía"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "musulmana"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr "sijista"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr "espiritualista"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr "taoista"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr "unitarismo"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr "zoroástrica"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr "Confesión"
@@ -23430,81 +24295,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr "anglicano"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "baptista"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "católico"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr "evangélico"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr "testigos de Jehová"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "luterano"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr "mormón"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "ortodoxo"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr "presbiteriano"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr "cuáquero"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr "chiita"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr "suní"
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Direcciones"
@@ -23513,5 +24378,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Editar direcciones"
@@ -23519,5 +24384,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "Número de portal"
@@ -23525,25 +24390,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "Nombre del edificio"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Nombre de la calle"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "Nombre de la ciudad"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Código postal"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "Código del país"
@@ -23552,5 +24417,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "Editar interpolación de números de portales"
@@ -23558,61 +24423,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr "Esquema numérico"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "impares"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "pares"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr "alfabético"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr "Construcciones"
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "Fábrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "Editar fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Editar torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr "Tipo de torre"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr "comunicación"
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr "observación"
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr "Altura (en metros)"
@@ -23620,25 +24485,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Torre de agua"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Editar torre de agua"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "Gasómetro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "Editar gasómetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "Faro"
@@ -23646,10 +24511,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Editar faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Molino de viento"
@@ -23657,10 +24522,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Editar molino de viento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Tubería"
@@ -23669,37 +24534,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Editar tubería"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
+msgid "gas"
+msgstr "gas"
+
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr "térmico"
+
+#: build/trans_presets.java:2353
 msgid "oil"
 msgstr "aceite"
 
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-msgid "gas"
-msgstr "gas"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr "aguas residuales"
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr "térmico"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr "cualquier substancia"
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr "sumergido"
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr "elevado"
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "Depuradora"
@@ -23709,10 +24574,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "Editar depuradora"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Grúa"
@@ -23720,21 +24585,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Editar grúa"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr "Baliza"
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr "Editar baliza"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "Vértice geodésico"
@@ -23742,10 +24602,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "Editar vértice geodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "Cámara de vigilacia"
@@ -23753,11 +24613,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Editar cámara de vigilancia"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "Generador de energía"
@@ -23767,35 +24639,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "Editar generador de energía"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "eólico"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "hidráulico"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "fósil"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "carbón"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "Central eléctrica"
@@ -23804,10 +24676,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "Editar central eléctrica"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "Subestación eléctrica"
@@ -23816,5 +24688,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "Editar subestación eléctrica"
@@ -23822,10 +24694,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr "Línea de referencia"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "Torre de electricidad"
@@ -23836,23 +24708,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "Editar torre de electricidad"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr "torre"
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr "poste"
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr "Referencia de la torre"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "Tendido eléctrico"
@@ -23861,79 +24733,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "Editar tendido eléctrico"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr "Tipo de línea"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr "alta tensión"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr "baja tensión"
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "Voltaje"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr "Cantidad de cables"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr "sencillo"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr "doble"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr "quad"
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr "Servicios"
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Baños"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
-msgstr ""
+msgstr "limitado"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "Buzón de correos"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Teléfono"
@@ -23942,5 +24809,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Editar teléfono"
@@ -23948,5 +24815,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Monedas"
@@ -23954,5 +24821,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "Billetes"
@@ -23960,5 +24827,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr "Tarjetas de recarga y monederos electrónicos"
@@ -23966,5 +24833,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr "Tarjetas de débito"
@@ -23972,15 +24839,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Tarjetas de crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Tarjetas telefónicas"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Reciclaje"
@@ -23989,5 +24856,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Editar punto limpio"
@@ -23995,63 +24862,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "Baterías"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "Envases"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "Ropas"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "Vidrio"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "Chatarra"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+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:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr "Backrest"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr "piedra"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr "plástico"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr "Color"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr "negro"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr "marrón"
@@ -24130,5 +25008,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -24138,31 +25016,31 @@
 msgstr "zona verde"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr "red"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr "azul"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr "gris"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr "blanco"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr "Número de asientos"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr "Apostadero de caza"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr "Editar apostadero de caza"
@@ -24171,30 +25049,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "Altura"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr "profundidad"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr "media"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr "total"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr "Oculto"
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr "Esclusa"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "Fuente"
@@ -24203,10 +25081,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "Editar fuente"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "Agua potable"
@@ -24215,10 +25093,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Editar agua potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr "Caja tibia"
@@ -24226,15 +25117,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr "Editar caja tibia"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Comercios"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr "Concesionario de automóviles"
@@ -24242,10 +25133,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "Editar concesionario de automóviles"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr "Tienda de bicicletas"
@@ -24254,28 +25145,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "Editar tienda de bicicletas"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "Supermercado"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "Editar supermercado"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr "Farmacia"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr "Editar farmacia"
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr "Tienda de alimentación"
@@ -24283,9 +25174,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr "Editar tienda de alimentación"
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "Kiosco"
@@ -24293,27 +25184,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "Editar kiosco"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr "Librería"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr "Editar librería"
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr "Agencia de viajes"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr "Editar agencia de viajes"
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "Máquina expendedora"
@@ -24321,5 +25212,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "Editar máquina expendedora"
@@ -24327,88 +25218,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "Expendedor automático de productos"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr "billetes de de transporte público"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr "abonos de transporte público"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr "billetes de aparcamiento"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "Alimentación"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "Bebidas"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "Caramelos"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "Estanco"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "fotos"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "comida para animales"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "Periódicos"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "juguetes"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "sellos"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "Tarjetas SIM"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr "Tarjetas telefónicas"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr "Bonos"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "condones"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr "tampones"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr "Bolsas para excrementos"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 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:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "Carnicería"
@@ -24416,9 +25307,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Editar carnicería"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "Panadería"
@@ -24426,9 +25317,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Editar panadería"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "Floristería"
@@ -24436,18 +25327,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "Editar floristería"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr "Tienda de productos orgánicos"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr "Editar tienda de productos orgánicos"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr "Tienda de bebidas alcohólicas"
@@ -24455,54 +25346,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr "Editar tienda de bebidas alcohólicas"
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr "Bebidas"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr "Editar tienda de bebidas"
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr "Tienda de informática"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "Editar tienda de informática"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr "Electrónica"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "Editar tienda de electrónica"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr "Editar Tienda Hifi"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr "Muebles"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "Editar mueblería"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr "Centro de jardinería"
@@ -24510,9 +25401,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr "Editar centro de jardinería"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr "Ferretería"
@@ -24520,9 +25411,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr "Editar ferretería"
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "Almacén de bricolaje"
@@ -24530,54 +25421,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "Editar almacén de bricolaje"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr "Papelería"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr "Editar papelería"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "Peluquería"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "Editar peluquería"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr "Zapatos"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "Editar zapatería"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr "Juguetes"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "Editar juguetería"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr "Editar tienda de videos"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Tintorería"
@@ -24585,9 +25476,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Editar tintorería"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Lavandería"
@@ -24595,9 +25486,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Editar lavandería"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr "Tienda de actividades al aire libre"
@@ -24605,28 +25496,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr "Editar tienda de actividades al aire libre"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr "Editar tienda de material de deportes"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr "Óptica"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "Editar óptica"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Dinero en efectivo"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Banco"
@@ -24634,14 +25525,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Editar banco"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "Cajero automático"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Cambio de moneda"
@@ -24649,5 +25540,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Editar cambio de moneda"
@@ -24655,15 +25546,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Editar cajero automático"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Centro médico"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr ""
@@ -24672,18 +25563,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "Editar médicos"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "Editar dentista"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Farmacia/Parafarmacia"
@@ -24691,5 +25582,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Editar farmacia/parafarmacia"
@@ -24697,9 +25588,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr "Expende con receta médica"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Hospital"
@@ -24707,10 +25598,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Editar hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr "Punto de acceso para emergencias"
@@ -24719,5 +25610,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr "Editar punto de acceso para emergencias"
@@ -24726,20 +25617,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr "Número de punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr "Nombre del Punto"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "Número de teléfono"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utilizar código internacional, como +12-345-67890)"
@@ -24747,5 +25638,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -24754,64 +25645,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "Editar veterinario"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr "Geografía"
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Lugares"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Continente"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Editar continente"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "País"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Editar país"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "Estado/Provincia"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "Editar estado/provincia"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "Región"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "Editar región"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr "Municipio"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr "Editar municipio"
@@ -24819,15 +25710,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "Ciudad (>100.000 hab.)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "Editar ciudad (>100.00 hab.)"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "Ciudad (10.000 - 100.000 hab.)"
@@ -24835,10 +25726,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "Editar ciudad (10.000 - 100.000 hab.)"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr ""
@@ -24848,5 +25739,5 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr ""
@@ -24855,15 +25746,15 @@
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Población (< 10.000 hab.)"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Editar población (< 10.000 hab.)"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr ""
@@ -24871,5 +25762,5 @@
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr ""
@@ -24879,5 +25770,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr "Paraje"
@@ -24885,10 +25776,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr "Editar paraje"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "Isla"
@@ -24896,10 +25787,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Editar isla"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr "Islote"
@@ -24907,5 +25798,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr "Editar islote"
@@ -24913,5 +25804,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "Entrada de cueva"
@@ -24919,10 +25810,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "Editar entrada de cueva"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Pico"
@@ -24930,10 +25821,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Editar pico"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "Glaciar"
@@ -24941,10 +25832,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "Editar glaciar"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "Volcán"
@@ -24952,70 +25843,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "Editar volcán"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Fronteras"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "Nacional"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "Editar frontera nacional"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "Administrativa"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "Editar frontera administrativa"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr "Editar frontera civil"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr "Político"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "Editar frontera política"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr "Parque Nacional"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "Editar límites del parque nacional"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Uso del suelo"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Árbol"
@@ -25024,15 +25915,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Editar árbol"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "Nombre botánico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "Bosque"
@@ -25041,5 +25932,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "Editar bosque"
@@ -25047,17 +25938,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "conífera"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "caducifolio"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "mixto"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "Plantación forestal"
@@ -25066,14 +25957,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "Editar zona forestal"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "Reserva natural"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "Editar reserva natural"
@@ -25081,25 +25972,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr "Pedregal"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr "Editar pedregal"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr "Matorral"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr "Editar matorral"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr "Braña"
@@ -25107,10 +25998,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr "Editar braña"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr "Brezal o landa"
@@ -25118,5 +26009,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "Editar brezal o landa"
@@ -25124,5 +26015,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr "Edificio agrario"
@@ -25131,45 +26022,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr "Editar edificio agrario"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "Tierra de labranza"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr "Editar tierra de labranza"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr "Prado"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr "Editar prado"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "Viñedo"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "Editar viñedo"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr "Huertos de ocio"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr "Editar zona de huertos de ocio"
@@ -25177,25 +26068,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "Jardín"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "Editar jardín"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "Pastizal"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr "Editar pastizal"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr ""
@@ -25205,10 +26096,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr "Editar parque municipal"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr "Espacio de uso común (plazas, alamedas, bulevares, etc.)"
@@ -25216,20 +26107,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr "Editar espacio de uso común"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "Parque"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "Editar parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr "Área de esparcimiento"
@@ -25237,5 +26128,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr "Editar área de esparcimiento"
@@ -25243,15 +26134,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr "Editar suelo residencial"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "Camposanto (para los cementerios próximos a las iglesias)"
@@ -25259,9 +26150,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Editar camposanto"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "Cementerio"
@@ -25269,39 +26160,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "Editar cementerio"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "Comercios"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr "Editar comercios"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "Oficinas"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr "Editar oficinas"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr "Editar suelo industrial"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr "Zona ferroviaria"
@@ -25309,15 +26200,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr "Editar zona ferroviaria"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "Militar"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr "Editar área militar"
@@ -25325,50 +26216,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "Zona en construcción"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "Editar zona en construcción"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr "Baldío"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr "Editar terreno baldío"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr "Suelo en construcción"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr "Editar suelo en contrucción"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr "Vertedero"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr "Editar vertedero"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "Cantera"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "Editar cantera"
@@ -25378,5 +26269,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr "Editar multipolígono"
@@ -25385,10 +26276,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr "segmento exterior"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr "segmento interior"
@@ -25396,5 +26287,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr "Restricción de giro"
@@ -25403,5 +26294,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr "Editar restricción de giro"
@@ -25409,34 +26300,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr "Restricción"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr "prohibido girar a la izquierda"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr "prohibido girar a la derecha"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr "prohibido continuar recto"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr "prohibido giro en U"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr "solo giro a la derecha"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr "solo giro a la izquierda"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr "solo ir recto"
@@ -25445,15 +26336,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr "desde la vía"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 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:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr "a la vía"
@@ -25461,5 +26352,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr "Ruta"
@@ -25468,5 +26359,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr "Editar ruta"
@@ -25474,5 +26365,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr "Tipo de ruta"
@@ -25563,5 +26454,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -25571,17 +26462,17 @@
 msgstr "bicicleta"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr "carretera"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr "ski"
@@ -25641,5 +26532,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -25648,9 +26539,9 @@
 msgstr "pie"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr "tranvía"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr "desvío"
@@ -25664,10 +26555,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr "Descripción del símbolo"
@@ -25675,31 +26566,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr "Red"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr "Ruta estatal"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr "Propuesto"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr "Suplente"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr "temporal"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr "Conexión"
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr "Color (hex)"
@@ -25708,107 +26599,32 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr "segmento de la ruta"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr "segmento siguiente"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr "segmento anterior"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr "punto de detención"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr "próximo punto de parada"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 msgid "backward halt point"
 msgstr "anterior punto de parada"
-
-#. <!--
-#. 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 "estándar"
 
 #. mappaint style named "standard"
@@ -26344,77 +27160,4 @@
 msgid "highway_track"
 msgstr "pista"
-
-#. 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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
-msgstr "ferrocarril"
 
 #. color rail
@@ -26802,7 +27545,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "baptista"
+msgstr ""
 
 #. color manmade
@@ -29934,164 +30676,10 @@
 #: build/trans_wms.java:46
 msgid "Lodi - Italy"
-msgstr ""
+msgstr "Lodi - Italia"
 
 #. 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 plugin could not be removed. Probably it was already disabled"
-#~ msgstr ""
-#~ "El componente no puede ser eliminado. Probablemente ya estaba desabilitado"
-
-#~ msgid "Bridleway"
-#~ msgstr "Vía ecuestre"
-
-#~ msgid "Cycleway"
-#~ msgstr "Vía ciclable"
-
-#~ msgid "Footway"
-#~ msgstr "Vía peatonal"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Pista de grado 1 (pavimentada)"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Editar pista de grado 1 (pavimentada)"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Pista de grado 2 (de áridos o zahorra)"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Editar pista de grado 2 (de áridos o zahorra)"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Pista de grado 3 (de áridos con vegetación entre rodaduras)"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Editar pista de grado 3 (de áridos con vegetación entre rodaduras)"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Pista de grado 4 (de tierra con vegetación entre rodaduras)"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Editar pista de grado 4 (de tierra con vegetación entre rodaduras)"
-
-#~ msgid "Track Grade 5"
-#~ msgstr ""
-#~ "Pista de grado 5 (con rodaduras apenas visibles entre la vegetación)"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr ""
-#~ "Editar pista de grado 5 (con rodaduras apenas visibles entre la "
-#~ "vegetación)"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Editar sendero"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "Sendero de montaña"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Editar sendero de montaña"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Editar sendero de montaña exigente"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Editar sendero alpino"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Editar sendero de montaña exigente"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Editar sendero alpino difícil"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "Requreido ID > 0, obtenido {0}"
-
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "El parámetro''{0}'' no debe ser nulo"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "el parámetro ''{0}'' no debe ser nulo"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "Se esperaba instancia de OsmDataLayer o GpxLayer. Obtenida \"{0}\""
-
-#~ msgid ""
-#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
-#~ "This can lead to nodes being deleted accidentally.\n"
-#~ "Are you really sure to continue?"
-#~ msgstr ""
-#~ "La(s) vía(s) seleccionadas tienen nodos fuera del área descargada.\n"
-#~ "Esto puede acabar con nodos borrados accidentalmente.\n"
-#~ "¿Está seguro de continuar?"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "No se puede deshacer la operación \"{0}\" porque la capa \"{1}\"  ya no "
-#~ "está presente."
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "El párametro ''{0}'' no debe estar vacío"
-
-#~ msgid "Expected array of length 4, got {0}"
-#~ msgstr "Esperada una matriz de longitud 4, obtenida {0}"
-
-#~ msgid "Illegal double value ''{0}''"
-#~ msgstr "Valor doble ''{0}'' ilegal"
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "Se esperaba un ID >=0. Obtenido {0}"
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "el paremetro \"{0}\" no es una clase aceptable, obtenido \"{1}\""
-
-#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
-#~ msgstr "Paŕametro esperado ''{0}'' > 0, obtenido {1}"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr ""
-#~ "se esperaba el parámetro ''{0}'' en el intervalo 0..{1}, se obtuvo {2}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "parámetro \"{0}\" > 0 esperado, obtenido \"{1}\"."
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "pa´rametro actual fuera del rango: obtenido {0}"
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "índice de columna inexperado. Obtenido {0}"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "El parámetro 'col' debe ser 0 o 1. Obtenido {0}"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "parámetro ''{0}'' no debe estar vacío"
-
-#~ msgid "Dialog not created yet. Invoke createInstance() first"
-#~ msgstr "Diálogo no creado todavía. Invocar primero createInstance()"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Conflictos en dato"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "imagen"
-#~ msgstr[1] "imagenes"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-#~ msgstr "parámetro ''{0}'' >= 0 esperado, obtenido ''{1}'"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "El complemento {0} requiere una actualizar JOSM a la versión {1}"
-
-#~ msgid "<html>"
-#~ msgstr "<html>"
+msgstr "Sicilia - Italia"
 
 #~ msgid "Move"
@@ -30144,7 +30732,4 @@
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "No hay hora para el punto {0} x {1}"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "La hora no pudo ser analizada sintácticamente."
 
 #~ msgid "Image"
@@ -30201,4 +30786,9 @@
 #~ msgid "unnamed"
 #~ msgstr "sin nombre"
+
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "imagen"
+#~ msgstr[1] "imagenes"
 
 #~ msgid "timezone difference: "
@@ -30463,9 +31053,9 @@
 #~ msgstr "Contraseña del servidor proxy"
 
+#~ msgid "Boat"
+#~ msgstr "Barco"
+
 #~ msgid "Drawbridge"
 #~ msgstr "Puente levadizo"
-
-#~ msgid "Station"
-#~ msgstr "Estación"
 
 #~ msgid "Rotate"
@@ -30493,8 +31083,4 @@
 #~ msgid "Only one node selected"
 #~ msgstr "Solo hay un nodo seleccionado"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr ""
-#~ "Por favor seleccione vías de ángulos casi rectos para ortogonalizar."
 
 #~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
@@ -30677,4 +31263,13 @@
 #~ msgstr "No se pueden leer los resultados de lugares desde el servidor"
 
+#~ msgid ""
+#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
+#~ "This can lead to nodes being deleted accidentally.\n"
+#~ "Are you really sure to continue?"
+#~ msgstr ""
+#~ "La(s) vía(s) seleccionadas tienen nodos fuera del área descargada.\n"
+#~ "Esto puede acabar con nodos borrados accidentalmente.\n"
+#~ "¿Está seguro de continuar?"
+
 #~ msgid "Metacarta Map Rectifier image id"
 #~ msgstr "Id de la imagen rectificada de Metacarta"
@@ -30683,6 +31278,9 @@
 #~ msgstr "Descargar imagen rectificada desde Metacarta's Map Rectifier WMS"
 
-#~ msgid "board"
-#~ msgstr "cartel"
+#~ msgid "Footway"
+#~ msgstr "Vía peatonal"
+
+#~ msgid "Cycleway"
+#~ msgstr "Vía ciclable"
 
 #~ msgid "No outer way for multipolygon ''{0}''."
@@ -30750,4 +31348,32 @@
 #~ "{0}"
 
+#~ msgid "Edit Demanding Mountain Hiking"
+#~ msgstr "Editar sendero de montaña exigente"
+
+#~ msgid "Mountain Hiking"
+#~ msgstr "Sendero de montaña"
+
+#~ msgid "Edit Mountain Hiking"
+#~ msgstr "Editar sendero de montaña"
+
+#~ msgid "Edit Alpine Hiking"
+#~ msgstr "Editar sendero alpino"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "Pista de grado 3 (de áridos con vegetación entre rodaduras)"
+
+#~ msgid "Track Grade 2"
+#~ msgstr "Pista de grado 2 (de áridos o zahorra)"
+
+#~ msgid "Track Grade 1"
+#~ msgstr "Pista de grado 1 (pavimentada)"
+
+#~ msgid "Track Grade 4"
+#~ msgstr "Pista de grado 4 (de tierra con vegetación entre rodaduras)"
+
+#~ msgid "Track Grade 5"
+#~ msgstr ""
+#~ "Pista de grado 5 (con rodaduras apenas visibles entre la vegetación)"
+
 #~ msgid "Authors: {0}"
 #~ msgstr "Autores: {0}"
@@ -30784,7 +31410,4 @@
 #~ msgstr "Sincronizar hora con la del receptor GPS"
 
-#~ msgid "Public"
-#~ msgstr "Público"
-
 #~ msgid "viaduct"
 #~ msgstr "viaducto"
@@ -30795,4 +31418,7 @@
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Obviando una vía porque incluye un nodo que no existe: {0}\n"
+
+#~ msgid "Edit Hiking"
+#~ msgstr "Editar sendero"
 
 #~ msgid "Shop"
@@ -30945,4 +31571,27 @@
 #~ msgstr "Etiquetado automático de la fuente añadida:"
 
+#~ msgid "Edit Track of grade 1"
+#~ msgstr "Editar pista de grado 1 (pavimentada)"
+
+#~ msgid "Edit Track of grade 2"
+#~ msgstr "Editar pista de grado 2 (de áridos o zahorra)"
+
+#~ msgid "Edit Track of grade 3"
+#~ msgstr "Editar pista de grado 3 (de áridos con vegetación entre rodaduras)"
+
+#~ msgid "Edit Track of grade 4"
+#~ msgstr "Editar pista de grado 4 (de tierra con vegetación entre rodaduras)"
+
+#~ msgid "Edit Track of grade 5"
+#~ msgstr ""
+#~ "Editar pista de grado 5 (con rodaduras apenas visibles entre la "
+#~ "vegetación)"
+
+#~ msgid "Edit Demanding Alpine Hiking"
+#~ msgstr "Editar sendero de montaña exigente"
+
+#~ msgid "Edit Difficult Alpine Hiking"
+#~ msgstr "Editar sendero alpino difícil"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Editar un puente levadizo"
@@ -30980,7 +31629,4 @@
 #~ "Asignar manualmente la zona Lambert (p. ej. para localizaciones entre dos "
 #~ "zonas)"
-
-#~ msgid "Interpolation"
-#~ msgstr "Interpolación"
 
 #~ msgid "Optional"
@@ -31136,4 +31782,7 @@
 #~ msgstr "Extender al final de la línea"
 
+#~ msgid "Plugin {0} requires JOSM update to version {1}."
+#~ msgstr "El complemento {0} requiere una actualizar JOSM a la versión {1}"
+
 #~ msgid "Login name (e-mail) to the OSM account."
 #~ msgstr "Nombre de usuario (correo-e) a la cuenta OSM"
@@ -31144,4 +31793,7 @@
 #~ msgid "Apply partial resolutions"
 #~ msgstr "Aplicar resolución parcial"
+
+#~ msgid ">"
+#~ msgstr ">"
 
 #~ msgid "Checking whether primitive {0} is gone ..."
@@ -31240,4 +31892,7 @@
 #~ msgstr "Eliminando miembro de relación {0} {1}"
 
+#~ msgid "Conflicts in data"
+#~ msgstr "Conflictos en dato"
+
 #~ msgid "Deleted member ''{0}'' in relation."
 #~ msgstr "Miembro ''{0}'' borrado en la relación."
@@ -31296,4 +31951,7 @@
 #~ msgid "Can't search because there is no loaded data."
 #~ msgstr "No se puede buscar porque no hay datos cargados."
+
+#~ msgid "Dialog not created yet. Invoke createInstance() first"
+#~ msgstr "Diálogo no creado todavía. Invocar primero createInstance()"
 
 #~ msgid ""
@@ -31371,7 +32029,19 @@
 #~ "HREF=\"{1}\">spanish</A>."
 
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "el parámetro ''{0}'' no debe ser nulo"
+
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr "Se esperaba instancia de OsmDataLayer o GpxLayer. Obtenida \"{0}\""
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "Retorno de valor inexperado. Obtenido {0}"
 
+#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "parámetro \"{0}\" > 0 esperado, obtenido \"{1}\"."
+
+#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
+#~ msgstr "el paremetro \"{0}\" no es una clase aceptable, obtenido \"{1}\""
+
 #~ msgid "There's no primitive with version {0} in this history."
 #~ msgstr "No existe una primitiva con la versión {0} en este historial"
@@ -31379,4 +32049,8 @@
 #~ msgid "There's no version valid at date ''{0}'' in this history."
 #~ msgstr "No hay ninguna versión válida en la fecha ''{0}'' en este historial"
+
+#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
+#~ msgstr ""
+#~ "se esperaba el parámetro ''{0}'' en el intervalo 0..{1}, se obtuvo {2}"
 
 #~ msgid "No earliest version found. History is empty."
@@ -31386,4 +32060,16 @@
 #~ msgstr ""
 #~ "no se encontró ninguna versión más reciente. El histórico está vacío."
+
+#~ msgid "Parameter current out of range. Got {0}."
+#~ msgstr "pa´rametro actual fuera del rango: obtenido {0}"
+
+#~ msgid "Unexpected column index. Got {0}."
+#~ msgstr "índice de columna inexperado. Obtenido {0}"
+
+#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
+#~ msgstr "El parámetro 'col' debe ser 0 o 1. Obtenido {0}"
+
+#~ msgid "Parameter ''{0}'' must not be empty."
+#~ msgstr "parámetro ''{0}'' no debe estar vacío"
 
 #~ msgid "Index out of bounds. Got {0}."
@@ -31409,4 +32095,7 @@
 #~ "obtenido \"{1}\""
 
+#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
+#~ msgstr "parámetro ''{0}'' >= 0 esperado, obtenido ''{1}'"
+
 #~ msgid ""
 #~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
@@ -31416,4 +32105,10 @@
 #~ "<br>¿Eliminar de la relación?</html>"
 
+#~ msgid "Bridleway"
+#~ msgstr "Vía ecuestre"
+
+#~ msgid "Expected ID >= 0. Got {0}."
+#~ msgstr "Se esperaba un ID >=0. Obtenido {0}"
+
 #~ msgid "Group common Address Interpolation inputs in a single dialog,"
 #~ msgstr ""
@@ -31440,7 +32135,23 @@
 #~ msgstr "Error de actualización solicitado: no hay nivel de zoom 12"
 
+#~ msgid "The plugin could not be removed. Probably it was already disabled"
+#~ msgstr ""
+#~ "El componente no puede ser eliminado. Probablemente ya estaba desabilitado"
+
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "El parámetro''{0}'' no debe ser nulo"
+
 #~ msgid "Error: failed to add authentication credentials to the connection."
 #~ msgstr ""
 #~ "Error: fallo al añadir credenciales de autentificación a la conexión."
+
+#~ msgid "<html>"
+#~ msgstr "<html>"
+
+#~ msgid ""
+#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
+#~ msgstr ""
+#~ "No se puede deshacer la operación \"{0}\" porque la capa \"{1}\"  ya no "
+#~ "está presente."
 
 #~ msgid "Current changeset is null. Can't upload data."
@@ -31462,4 +32173,7 @@
 #~ msgstr "Oinarrizkoa eguneratzen"
 
+#~ msgid "Id > 0 required, got {0}"
+#~ msgstr "Requreido ID > 0, obtenido {0}"
+
 #~ msgid "{0} Plugin successfully downloaded."
 #~ msgid_plural "{0} Plugins successfully downloaded."
@@ -31467,6 +32181,18 @@
 #~ msgstr[1] "{0} componentes actualizados correctamente."
 
+#~ msgid "Parameter ''{0}'' must not be empty"
+#~ msgstr "El párametro ''{0}'' no debe estar vacío"
+
+#~ msgid "Illegal double value ''{0}''"
+#~ msgstr "Valor doble ''{0}'' ilegal"
+
 #~ msgid "Please restart JOSM."
 #~ msgstr "Por favor, reinicia JOSM"
+
+#~ msgid "Expected array of length 4, got {0}"
+#~ msgstr "Esperada una matriz de longitud 4, obtenida {0}"
+
+#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
+#~ msgstr "Paŕametro esperado ''{0}'' > 0, obtenido {1}"
 
 #~ msgid ""
@@ -31476,2 +32202,5 @@
 #~ "Varias utilidades que hacen la vida en JOSM mucho más fácil: por ejemplo, "
 #~ "simplificar un vía, unir áreas, moverse a un determinada posición, etc."
+
+#~ msgid "Motorboat"
+#~ msgstr "Embarcación a motor"
Index: applications/editors/josm/i18n/po/et.po
===================================================================
--- applications/editors/josm/i18n/po/et.po	(revision 19689)
+++ applications/editors/josm/i18n/po/et.po	(revision 19698)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-19 00:01-0500\n"
-"PO-Revision-Date: 2010-01-17 00:53-0500\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-23 21:11+0000\n"
 "Last-Translator: Margus Värton <margus@dakar.ee>\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-01-13 18:26+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -70,11 +70,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -237,5 +237,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -249,13 +249,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -264,5 +264,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -288,5 +291,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Liida"
@@ -315,5 +318,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -380,9 +383,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -390,5 +393,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "OK"
@@ -439,6 +444,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -456,5 +461,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -463,11 +468,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -504,5 +509,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "konflikt"
@@ -514,9 +519,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37
 msgid "previous"
-msgstr ""
+msgstr "eelmine"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38
 msgid "next"
-msgstr ""
+msgstr "järgmine"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
@@ -635,14 +640,14 @@
 msgstr "Palun vali vähemalt kaks teed, mida sobitada."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Kopeeri"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Kopeeri valitud objektid puhvrisse."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Palun vali kopeerimiseks mõni objekt."
@@ -675,8 +680,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -685,5 +690,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -740,16 +745,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Impordi ajal leidis aset {0} konflikti."
-msgstr[1] "Impordi ajal leidis aset {0} konflikti."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "Konfliktid allalaadimisel"
-msgstr[1] "Konfliktid allalaadimisel"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -770,4 +774,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -777,4 +783,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Kahekordista ja kleebi valitud objekt."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Kahekordista"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "Liiguta hetkel valitud liiget ülespoole"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr ""
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "Suumi {0}"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr ""
 
 #. <button label="Info" hotkey="I">
@@ -865,10 +899,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 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] "Valitud tee ei sisalda valitud sõlme"
-msgstr[1] "Valitud tee ei sisalda valitud sõlmi"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -989,5 +1022,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "Viide"
@@ -1140,5 +1173,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr ""
 
@@ -1152,9 +1185,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Avan {0} faili..."
-msgstr[1] "Avan {0} faili..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1210,7 +1243,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1224,5 +1257,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "Liiguta kõik sõlmed 90 või 270 kraadise nurga alla."
 
@@ -1256,4 +1290,8 @@
 "undesirable results when doing rectangular alignments.<br>Change your "
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+msgid "Selection must consist only of ways and nodes."
 msgstr ""
 
@@ -1270,4 +1308,15 @@
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr "Palun vali peaaegu täisnurga all kohtuvad teed."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1354,5 +1403,5 @@
 #, java-format
 msgid "Could not rename file ''{0}''"
-msgstr ""
+msgstr "Ei suuda faili ümbernimetada ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/actions/RenameLayerAction.java:94
@@ -1373,18 +1422,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1409,12 +1458,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Viga"
@@ -1547,5 +1597,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1750,9 +1800,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "Kordista {0} sõlme {1} sõlmeks"
-msgstr[1] "Kordista {0} sõlme {1} sõlmeks"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1796,5 +1846,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr "Andmete allalaadimine"
@@ -1831,5 +1881,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
 msgid "There are no selected objects to update."
-msgstr ""
+msgstr "Ei ole valitud objekte värskendamiseks."
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
@@ -2032,5 +2082,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
 msgid "Check on the server"
-msgstr ""
+msgstr "Kontrolli serveris"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -2209,6 +2259,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2323,5 +2373,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Otsi objekte."
@@ -2503,5 +2553,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Otsi"
@@ -2541,22 +2591,22 @@
 
 #. case sensitive
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
+msgctxt "search"
+msgid "CS"
+msgstr ""
+
+#. case insensitive
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
-msgid "CS"
-msgstr ""
-
-#. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
-msgctxt "search"
 msgid "CI"
 msgstr ""
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2566,9 +2616,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr "Võtme väärtus ei saa olla tühi. Näide: võti=väärtus"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2701,9 +2751,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "Muuda {0} objekt"
-msgstr[1] "Muuda {0} objekti"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2758,7 +2808,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Otsi objekte."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2816,17 +2866,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Kustutusrežiim"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Andmekiht {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Seosed: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2904,9 +2954,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "Muuda {0} objekt"
-msgstr[1] "Muuda {0} objekti"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -2954,9 +3004,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "Undelete {0} primitive"
 msgid_plural "Undelete {0} primitives"
-msgstr[0] "Kustutatud või nihutatud primitiivid"
-msgstr[1] "Kustutatud või nihutatud primitiivid"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
@@ -2971,7 +3021,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Tõesti soovid kustutada valikut seosest {0}?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3029,7 +3079,6 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#, fuzzy
 msgid "Do not apply changes"
-msgstr "Avatud muutustekogumid puuduvad"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:66
@@ -3217,5 +3266,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3223,5 +3272,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3229,12 +3278,11 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
-msgstr "WC"
+msgstr ""
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3307,15 +3355,13 @@
 #. column header: filter text
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
-#, fuzzy
 msgctxt "filter"
 msgid "Text"
-msgstr "Test"
+msgstr ""
 
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "WC"
+msgstr ""
 
 #. column header: inverted filter
@@ -3356,19 +3402,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3377,5 +3423,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3383,5 +3429,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3459,7 +3505,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:327
-#, fuzzy
 msgid "The \"to\" way does not start or end at a \"via\" node."
-msgstr "Valitud tee ei sisalda valitud sõlme"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
@@ -3505,6 +3550,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3514,5 +3559,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3523,7 +3568,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3545,5 +3590,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "taust"
@@ -3687,6 +3732,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3694,37 +3739,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3733,10 +3779,10 @@
 msgstr[1] "{0} punkti"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3745,5 +3791,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3780,6 +3826,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Vastuolu"
@@ -3790,5 +3836,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-msgid "Authorization Failed"
+msgid "Authorisation Failed"
 msgstr ""
 
@@ -3991,5 +4037,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr ""
@@ -4030,5 +4075,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4039,5 +4084,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Muuda"
@@ -4108,29 +4153,29 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+msgid "The geographic longitude at the mouse pointer."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
-msgid "The geographic longitude at the mouse pointer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The name of the object at the mouse pointer."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+msgid "The geographic latitude at the mouse pointer."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
-msgid "The 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:104
-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:105
-msgid "The (compass) heading of the line segment being drawn."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
 msgid "The length of the new way segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4138,9 +4183,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4300,9 +4345,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Paranda sildikonfliktid"
-msgstr[1] "Paranda sildikonfliktid"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
@@ -4364,16 +4409,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4569,8 +4614,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr "Liida sõlmed vanimaks."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4718,5 +4767,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr ""
@@ -4762,5 +4811,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -4890,10 +4944,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "kõik"
@@ -4923,7 +4977,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-#, fuzzy, java-format
+#, java-format
 msgid "Tag collection does not include the selected value ''{0}''."
-msgstr "Valitud tee ei sisalda valitud sõlme"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
@@ -4973,7 +5027,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -4983,6 +5037,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5162,10 +5216,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5185,18 +5239,18 @@
 msgstr "Käsujada: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Lahenda"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr "Ava ülalolevast nimekirjast valitud kõigi objektide ühendamisdialoog."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5230,5 +5284,5 @@
 "<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.Click <strong>{0}</strong> to close anyway."
+"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.</"
@@ -5254,5 +5308,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5261,5 +5315,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5339,43 +5393,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Kihid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 msgid "Open a list of all loaded layers."
 msgstr "Ava kõikide laetud kihtide nimekiri."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Näita/Peida"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Kahekordista"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 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:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Liiguta valitud kiht ühe rea võrra alla."
@@ -5389,6 +5448,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Seosed"
@@ -5398,69 +5457,69 @@
 msgstr "Ava kõikide seoste nimekiri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "Seosed: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Ava toimetajas valitud seos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Kustuta valitud seos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Loo uus seos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Praegune valik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Ava valiku nimekirja aken."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Suurenda valitud elementidele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Suurenda valikule"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Valik: Relatsioonid:{0} / Teed:{1} / Punktid:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5468,5 +5527,5 @@
 msgstr "Valik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5818,8 +5877,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -5891,4 +5948,7 @@
 #. <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 />
@@ -5967,6 +6027,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6008,6 +6069,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6476,152 +6539,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Nimi"
@@ -7004,5 +7069,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<erinev>"
@@ -7057,55 +7122,55 @@
 msgstr "Lisa seaded"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Seaded: {0} / Liikmelisus: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Seaded / Liikmelisus"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Muuda seost"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Tõesti soovid kustutada valikut seosest {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Kustuta valitud võti kõkides objektides"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "Kustuda seadeid"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Lisa uus võtme/väärtuse paar kõikidele objektidele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Muuda kõikide valitud objektide võtme väärtust"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7547,47 +7612,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Järjehoidjad"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../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:187
+#: ../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:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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:212
+#: ../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:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr ""
@@ -7709,18 +7773,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -7731,34 +7795,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
 msgid "Enter a place name to search for:"
 msgstr "Sisesta otsitava koha nimi:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+#: ../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:147
+#: ../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:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Null pointer exception, arvatavasti mõned puuduvad sildid (tag)."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr ""
@@ -7769,7 +7833,9 @@
 #. 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" />
@@ -7778,10 +7844,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr ""
@@ -7790,5 +7857,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -7800,17 +7867,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "tundmatu"
@@ -8155,5 +8221,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr ""
@@ -8594,9 +8660,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8606,7 +8672,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -8618,16 +8684,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr ""
@@ -9040,68 +9106,68 @@
 msgstr[1] "{0} objekti kustutada:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Use global settings."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Kohanda värvi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Vaikimisi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Vali värv"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Heli import"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9111,23 +9177,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Piltide import"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9137,5 +9203,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9143,5 +9209,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9149,5 +9215,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9157,23 +9223,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9182,5 +9248,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9189,10 +9255,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Muuda andme kihiks"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9202,43 +9268,43 @@
 "kahjulikuks. <br> Kui soovite üles laadida radasid, vaata siia:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Muudetud sellest: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9247,9 +9313,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9257,5 +9323,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9263,23 +9329,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Andmekiht {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9288,5 +9354,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9300,5 +9366,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9311,11 +9377,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9324,32 +9390,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9396,28 +9462,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "punkt"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Viga {0} parsimisel"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Ei suutnud lugeda \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9426,34 +9491,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9461,64 +9526,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9528,45 +9593,45 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9575,5 +9640,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9581,41 +9646,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 msgid "The selected photos do not contain time information."
-msgstr "Valitud tee ei sisalda valitud sõlme"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
 "one."
-msgstr "Valitud tee ei sisalda valitud sõlme"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9624,5 +9687,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9631,63 +9694,63 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "Andmeid ei laetud."
-msgstr[1] "Andmeid ei laetud."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -9696,10 +9759,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -9708,5 +9771,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -9799,5 +9862,5 @@
 msgstr "gps marker"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -9805,5 +9868,5 @@
 msgstr[1] "markerid"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -9812,29 +9875,29 @@
 msgstr[1] "{0} koosneb {1} markerist"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "Sünkroniseeri heli"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 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:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr "Heli sünkroniseeritud punktis {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr "Loo heli marker mängimise alguses"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -9842,17 +9905,17 @@
 msgstr "Pane heli pausile punktis kuhu sa soovid markerit."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 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:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Näita/Peida Tekst/Ikoonid"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 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:171
+#: ../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 "
@@ -9860,5 +9923,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -9868,5 +9931,5 @@
 "rajapuhktile kuhu sa soovid sünkroniseerida"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "Ei saa uut heli markerit luua."
@@ -9892,5 +9955,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
 #, java-format
 msgid ""
@@ -9898,5 +9961,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
 #, java-format
 msgid ""
@@ -9948,7 +10011,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
 msgid "Authorize URL:"
-msgstr "Autor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10038,7 +10100,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
 msgid "Authorize now"
-msgstr "Autor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10176,7 +10237,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
 msgid "Please select an authorization procedure: "
-msgstr "Palun vali vähemalt neli sõlme."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10186,7 +10246,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
-#, fuzzy
 msgid "Close the dialog and cancel authorization"
-msgstr "Sule dialoogiaken ja katkesta allalaadimine"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
@@ -10499,5 +10558,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "PAlun vali rida muutmiseks"
@@ -10511,5 +10570,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10646,9 +10705,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -10678,6 +10732,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr ""
@@ -10716,8 +10770,8 @@
 msgstr ""
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr ""
@@ -10739,13 +10793,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr ""
@@ -10778,12 +10832,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr ""
@@ -11737,5 +11791,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -11743,18 +11804,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "Valikulised tunnused:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr "suletud tee"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tundmatu tüüp: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -11765,16 +11826,16 @@
 msgstr "Ei saa lugeda sildistamise eelseadeid: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Viga sõelumisel {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Elemente tüübist {0} toetatakse."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -11783,18 +11844,17 @@
 msgstr[1] "Muuda {0} objekti"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "Midagi pole valitud!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Muuda seadeid"
@@ -12068,6 +12128,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12092,9 +12152,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Parse error: vigane gpx dokumendi struktuur"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12117,7 +12177,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
@@ -12189,5 +12255,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "Koordinaadid imporditud: "
@@ -12288,9 +12354,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Muuda {0} objekt"
-msgstr[1] "Muuda {0} objekti"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -13277,6 +13343,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -13392,6 +13458,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13400,5 +13466,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -13546,4 +13612,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr ""
@@ -13634,5 +13701,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr ""
@@ -14211,5 +14278,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr ""
@@ -14366,21 +14433,21 @@
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr ""
@@ -14412,9 +14479,9 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -14429,13 +14496,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr ""
@@ -14444,6 +14511,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr ""
@@ -14669,17 +14736,17 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../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:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -14723,42 +14790,41 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr ""
@@ -14814,6 +14880,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -14822,73 +14888,73 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../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:43
+#: ../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:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../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:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../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:55
+#: ../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:57
+#: ../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:59
+#: ../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:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../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:67
+#: ../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:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14896,5 +14962,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -14902,5 +14968,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14908,58 +14974,58 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../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:79
+#: ../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:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../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:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr ""
@@ -14983,5 +15049,5 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr ""
@@ -15012,5 +15078,5 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr ""
@@ -15084,5 +15150,5 @@
 msgstr ""
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr ""
@@ -15339,4 +15405,70 @@
 #: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:135
 msgid "Firefox executable"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+msgid "Read error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Lisa koordinaadid uuele sõlmele."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+msgid "keep backup files"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Viga"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+msgid "File could not be deleted!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Ei suuda faili ümbernimetada ''{0}''"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+msgid "Override old backup files?"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+msgid "Keep old backups and continue"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Ülekirjutamine"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+msgid "Could not delete temporary file!"
 msgstr ""
 
@@ -15610,6 +15742,6 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -15731,72 +15863,128 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+msgid "Terrace a house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+#, fuzzy
+msgid "Interpolation"
+msgstr "Info"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Tänavad"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Pildi numbrid"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Punkti number"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+msgid "Lowest housenumber of the terraced house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Loo uus seos"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Kustuta sõlmi või teid"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "tänava nimi sisaldab ss"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../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:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr ""
@@ -16028,5 +16216,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr ""
@@ -16036,5 +16224,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16043,9 +16231,9 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr ""
@@ -16080,5 +16268,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr "Hulknurk"
@@ -16223,7 +16411,7 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -16231,80 +16419,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16312,86 +16500,86 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -16831,5 +17019,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -16840,63 +17028,63 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+msgid "Download visible tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
-msgid "Download visible tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -17147,6 +17335,13 @@
 msgstr ""
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17155,15 +17350,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17172,10 +17367,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17184,15 +17379,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17202,10 +17397,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17214,5 +17409,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17221,10 +17416,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -17331,6 +17526,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -17338,6 +17542,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr ""
@@ -17354,5 +17559,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Rajad"
@@ -17374,10 +17579,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -17421,14 +17626,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "Ühesuunaline"
@@ -17471,13 +17676,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -17515,13 +17720,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -17556,13 +17761,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr ""
@@ -17597,13 +17802,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr ""
@@ -17734,4 +17939,13 @@
 #: build/trans_presets.java:225
 msgid "Edit Unclassified Road"
+msgstr ""
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
 msgstr ""
 
@@ -17750,15 +17964,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr ""
@@ -17770,5 +17984,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Tänav"
@@ -17777,5 +17991,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr ""
@@ -17793,16 +18007,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr ""
@@ -17824,166 +18041,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "mets"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr ""
@@ -17991,5 +18215,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr ""
@@ -17998,5 +18222,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr ""
@@ -18004,5 +18228,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr ""
@@ -18011,5 +18235,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr ""
@@ -18017,5 +18241,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr "Teenindus"
@@ -18024,5 +18248,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr ""
@@ -18032,18 +18256,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr ""
@@ -18051,5 +18275,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr ""
@@ -18059,5 +18283,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -18065,5 +18289,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -18072,5 +18296,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -18079,20 +18303,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -18100,9 +18324,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 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"
@@ -18113,6 +18338,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18124,4 +18347,5 @@
 #. 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"
@@ -18140,141 +18364,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr ""
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr ""
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr ""
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr ""
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr ""
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr ""
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -18289,10 +18521,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr ""
@@ -18308,10 +18540,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr ""
@@ -18326,27 +18558,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr ""
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr ""
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr ""
@@ -18354,25 +18578,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr ""
@@ -18383,5 +18607,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr ""
@@ -18401,10 +18625,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr ""
@@ -18426,10 +18650,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr ""
@@ -18451,10 +18675,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr ""
@@ -18476,5 +18700,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -18489,9 +18713,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr ""
@@ -18505,9 +18729,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr ""
@@ -18537,10 +18761,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr ""
@@ -18570,5 +18794,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -18580,10 +18804,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr ""
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr ""
@@ -18591,19 +18815,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Teed"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr ""
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr ""
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr ""
@@ -18619,5 +18843,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr ""
@@ -18625,5 +18849,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr ""
@@ -18632,40 +18856,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "tüüp"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "hall"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "hall"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "hall"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "hall"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "hall"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr ""
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -18673,5 +18891,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -18679,28 +18897,26 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr "matkamine"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "Purskaev"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
-msgstr "matkamine"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
 msgstr ""
@@ -18708,5 +18924,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr ""
@@ -18715,6 +18931,27 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
+msgstr ""
+
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
 msgstr ""
 
@@ -18747,7 +18984,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "Jalgrattatee"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -18782,11 +19018,10 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "Sobita ikkagi."
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr ""
@@ -18795,10 +19030,9 @@
 #. <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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr ""
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr ""
@@ -18806,5 +19040,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr ""
@@ -18814,5 +19048,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr ""
@@ -18820,10 +19054,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr ""
@@ -18831,15 +19065,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr ""
@@ -18847,5 +19081,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr ""
@@ -18853,5 +19087,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -18884,17 +19119,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "Operaatorfirma"
@@ -18903,5 +19138,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr ""
@@ -18911,5 +19146,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -18918,27 +19153,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr ""
@@ -18946,6 +19181,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr ""
@@ -18954,11 +19189,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -18966,30 +19201,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr ""
@@ -18997,5 +19232,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -19004,14 +19239,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr ""
@@ -19022,14 +19303,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr ""
@@ -19039,26 +19320,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "Linnapiiri märk"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr ""
@@ -19066,5 +19349,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr ""
@@ -19072,5 +19355,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr ""
@@ -19078,11 +19361,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr ""
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr ""
@@ -19090,5 +19380,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr ""
@@ -19096,5 +19386,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -19106,7 +19396,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr ""
@@ -19114,5 +19404,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr ""
@@ -19120,5 +19410,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr ""
@@ -19126,5 +19416,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr ""
@@ -19169,16 +19459,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr ""
@@ -19187,5 +19477,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr ""
@@ -19193,5 +19483,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr ""
@@ -19199,10 +19489,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr ""
@@ -19210,15 +19500,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr ""
@@ -19226,5 +19516,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr ""
@@ -19232,10 +19522,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr ""
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr ""
@@ -19245,5 +19535,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr ""
@@ -19252,12 +19542,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
-msgid "Fence"
-msgstr ""
-
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#: build/trans_presets.java:817 build/trans_presets.java:819
+msgid "Fence"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr ""
@@ -19265,5 +19567,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr ""
@@ -19272,5 +19574,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr ""
@@ -19282,15 +19584,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr ""
@@ -19298,50 +19601,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr ""
@@ -19349,25 +19652,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr ""
@@ -19378,11 +19681,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr ""
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr ""
@@ -19390,5 +19693,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr ""
@@ -19396,5 +19699,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr ""
@@ -19402,10 +19705,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr ""
@@ -19413,10 +19727,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr ""
@@ -19424,10 +19738,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr ""
@@ -19437,5 +19751,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr ""
@@ -19443,15 +19757,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr ""
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr ""
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr ""
@@ -19459,15 +19773,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr ""
@@ -19475,15 +19789,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -19491,5 +19805,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr ""
@@ -19498,10 +19812,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr ""
@@ -19512,14 +19826,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr ""
@@ -19533,35 +19847,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr ""
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr ""
@@ -19569,20 +19883,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr ""
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr ""
@@ -19590,10 +19904,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr ""
@@ -19601,5 +19915,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr ""
@@ -19607,5 +19921,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr ""
@@ -19613,5 +19927,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr ""
@@ -19620,5 +19934,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr ""
@@ -19626,10 +19940,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr ""
@@ -19637,5 +19951,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr ""
@@ -19643,5 +19957,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr ""
@@ -19649,15 +19963,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr ""
@@ -19666,5 +19980,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr ""
@@ -19672,20 +19986,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr ""
@@ -19694,15 +20008,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr ""
@@ -19710,10 +20024,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr ""
@@ -19721,10 +20035,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr ""
@@ -19734,20 +20048,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr ""
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr ""
@@ -19755,5 +20069,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr ""
@@ -19762,139 +20076,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr "standard"
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr ""
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr "raudtee"
+
+#. 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:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+msgid "Voltage"
+msgstr "Pinge"
+
+#. 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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr ""
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr ""
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr ""
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr ""
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr ""
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr ""
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr ""
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr ""
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr ""
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr ""
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr ""
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr ""
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr ""
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr ""
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr ""
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr ""
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr ""
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr ""
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr ""
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr ""
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr ""
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr ""
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr ""
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr ""
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr ""
@@ -19903,5 +20456,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr ""
@@ -19910,5 +20463,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr ""
@@ -19918,5 +20471,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr ""
@@ -19924,5 +20477,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr ""
@@ -19931,10 +20484,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr ""
@@ -19942,10 +20502,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr ""
@@ -19953,10 +20513,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr ""
@@ -19964,10 +20524,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr ""
@@ -19975,10 +20535,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -19986,12 +20546,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr ""
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr ""
@@ -20001,9 +20574,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr ""
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20057,32 +20687,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "Avatud"
@@ -20141,94 +20771,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20240,5 +20946,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20248,5 +20954,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr ""
@@ -20257,25 +20963,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr ""
@@ -20284,48 +20990,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr ""
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr ""
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr ""
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr ""
@@ -20333,5 +21039,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr ""
@@ -20340,10 +21046,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr ""
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr ""
@@ -20351,5 +21057,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr ""
@@ -20357,10 +21063,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr ""
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr ""
@@ -20369,15 +21075,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr ""
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Avalik transport"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -20387,5 +21093,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -20393,5 +21099,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr ""
@@ -20399,5 +21105,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr ""
@@ -20405,5 +21111,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr ""
@@ -20411,5 +21117,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr ""
@@ -20418,5 +21124,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr ""
@@ -20424,5 +21130,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr ""
@@ -20431,5 +21137,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr ""
@@ -20441,5 +21147,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr ""
@@ -20447,10 +21153,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr ""
@@ -20459,10 +21165,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr ""
@@ -20471,5 +21177,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr ""
@@ -20478,5 +21184,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr ""
@@ -20484,5 +21190,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr ""
@@ -20492,5 +21198,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr ""
@@ -20499,25 +21205,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr ""
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr ""
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr ""
@@ -20525,5 +21232,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr ""
@@ -20531,5 +21238,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr ""
@@ -20537,32 +21244,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr ""
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr ""
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr ""
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr ""
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+msgid "Beacon"
+msgstr "Tuletorn"
+
+#. 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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Majutus"
@@ -20574,5 +21376,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -20581,15 +21383,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr ""
@@ -20597,20 +21399,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr ""
@@ -20618,10 +21420,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr ""
@@ -20629,30 +21431,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr ""
@@ -20660,10 +21462,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Toit ja jook"
@@ -20674,5 +21476,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restoran"
@@ -20680,5 +21482,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr ""
@@ -20686,5 +21488,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr ""
@@ -20692,61 +21494,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "kohalik"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "Kiirtoit"
@@ -20754,9 +21568,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "Kohvik"
@@ -20764,9 +21586,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr ""
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "Pubi"
@@ -20774,18 +21596,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr ""
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr "Baar"
@@ -20793,9 +21615,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "Ööklubi"
@@ -20803,24 +21625,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr ""
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Turism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr "Vaatamisväärsus"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Muuseum"
@@ -20828,9 +21650,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr ""
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Loomaaed"
@@ -20839,9 +21661,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr ""
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr ""
@@ -20849,24 +21671,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "Teemapark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr ""
@@ -20874,5 +21696,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr ""
@@ -20880,19 +21702,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr "Infopunkt"
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Kaart"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr ""
@@ -20930,5 +21752,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -20936,28 +21758,28 @@
 msgstr "tänav"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr ""
@@ -20967,5 +21789,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr ""
@@ -20973,5 +21795,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr "Matkamine"
@@ -20979,6 +21801,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr ""
@@ -20986,5 +21808,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr ""
@@ -20992,6 +21814,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "Suusatamine"
@@ -20999,5 +21821,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr ""
@@ -21005,46 +21827,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr ""
@@ -21052,29 +21874,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr ""
@@ -21082,25 +21904,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr "Lõkkease"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "Piknikuplats"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Ajaloolised kohad"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Loss"
@@ -21109,19 +21931,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr ""
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Varemed"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr ""
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr ""
@@ -21130,9 +21952,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr ""
@@ -21140,10 +21962,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr ""
@@ -21151,5 +21973,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -21157,15 +21979,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "Mälestusmärk"
@@ -21173,55 +21995,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Puhkus"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "Veepark"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Mänguväljak"
@@ -21229,35 +22051,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Kalapüük"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Staadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr ""
@@ -21271,6 +22093,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "vali spordiala:"
@@ -21662,6 +22484,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -21695,225 +22517,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr "kanuu"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "ameerika_jalgpall"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "suusatamine"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "jalgpall"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "lauatennis"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "Golfiväljak"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "Miniatuurne golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr "Mitu"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr ""
@@ -21952,21 +22774,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "tüüp"
@@ -22005,203 +22827,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr "Kergejõustik"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "Vibusport"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr ""
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr ""
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "Ujumine"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr ""
@@ -22209,56 +23031,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr "mägi"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr "murdmaa"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr "lumepark"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr "Raskusaste"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr "kerge"
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr ""
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "Lasketiir"
@@ -22266,182 +23084,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "Jalgpall"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr ""
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "Pesapall"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr "Vali pesapall"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "Korvpall"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "Vali korvpall"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "Golfiväljak"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr "Vali kriket"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "Ragbi"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr "Vali ragbi"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "Laua tennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "Vali laua tennis"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "Vali tennis"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Ehitised"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "Ehirus"
@@ -22449,5 +23267,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Avalik hoone"
@@ -22455,10 +23273,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "Raekoda"
@@ -22466,10 +23284,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Vali raekoda"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Saatkond"
@@ -22477,10 +23295,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Vali saatkond"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "Kohtumaja"
@@ -22489,10 +23307,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Vali kohtumaja"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Vangla"
@@ -22501,10 +23319,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Vali vangla"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Politsei"
@@ -22514,10 +23332,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Vali politsei"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "Tuletõrjedepoo"
@@ -22526,10 +23344,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Vali tuletõrjedepoo"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Postkontor"
@@ -22537,5 +23355,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr ""
@@ -22543,15 +23361,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "Lasteaed"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "Vali lasteaed"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "Kool"
@@ -22559,10 +23377,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "Vali kool"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "Ülikool"
@@ -22570,10 +23388,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "Vali ülikool"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "Kolledž"
@@ -22581,5 +23399,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "Vali kolledž"
@@ -22587,5 +23405,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Kino"
@@ -22594,10 +23412,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Vali kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "Raamatukogu"
@@ -22606,9 +23424,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Vali raamatukogu"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr ""
@@ -22616,10 +23434,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Teater"
@@ -22628,10 +23446,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Vali teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "Palvekoht"
@@ -22641,5 +23459,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "Vali palvekoht"
@@ -22648,6 +23466,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "Religioon"
@@ -22656,66 +23474,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "budist"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "kristlane"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "juudi"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "moslem"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr "zoroastrism (pärsia)"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr "Usutunnistus"
@@ -22724,81 +23542,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr "anglikaan"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "katoliku"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr "evangeelne"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr "jehoovatunnistajad"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "luterlane"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr "metodist"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr "mormoon"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "ortodoksne"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr "nelipühalane"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr "presbüterlane"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "protestantlik"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr "kveeker"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr "šiia"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Aadressid"
@@ -22807,5 +23625,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Vali aadressi infot"
@@ -22813,5 +23631,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "Maja number"
@@ -22819,25 +23637,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "Maja nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "Linna nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Posti kood"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "Riigi kood"
@@ -22846,5 +23664,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -22852,61 +23670,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "paaritu"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "paaris"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr "Inimtekkeline"
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "Töökojad"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "Vali töökojad"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Torn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Vali torn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr ""
@@ -22914,25 +23732,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Veetorn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Vali veetorn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "Gaasimahuti"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "Vali gaasimahuti"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "Majakas"
@@ -22940,10 +23758,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Vali majakas"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Tuuleveski"
@@ -22951,10 +23769,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Vali tuuleveski"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Torustik"
@@ -22963,37 +23781,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Vali torustik"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
+msgid "gas"
+msgstr "gaas"
+
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr ""
+
+#: build/trans_presets.java:2353
 msgid "oil"
 msgstr "õli"
 
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-msgid "gas"
-msgstr "gaas"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr ""
@@ -23003,10 +23821,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Kraana"
@@ -23014,21 +23832,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Vali kraana"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr "Tuletorn"
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr "Vali tuletorn"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "Geodeetiline punkt"
@@ -23036,10 +23849,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "Vali ülevaatlus punkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "järelvalve"
@@ -23047,11 +23860,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Vali järelvalve kaamera"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "Elektri generaator"
@@ -23061,35 +23886,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "Vali elektri generaator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "tuul"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "hüdro"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "fosiil"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "tuuma"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "süsi"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr "päikeseenergia"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "Elektrijaam"
@@ -23098,10 +23923,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "Vali elektrijaam"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "Elektrialajaam"
@@ -23110,5 +23935,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "Vali elektri alajaam"
@@ -23116,10 +23941,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr ""
@@ -23130,23 +23955,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr ""
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr ""
@@ -23155,79 +23980,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr "Joonetüüp"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr "joon"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr ""
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "Pinge"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr "üksik"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr "topelt"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr "kolmekordne"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr "Teenused"
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Tualetid"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr "Märkus"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Telefon"
@@ -23236,5 +24056,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr ""
@@ -23242,5 +24062,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Mündid"
@@ -23248,5 +24068,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "Märkused"
@@ -23254,5 +24074,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -23260,5 +24080,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr "Deebetkaart"
@@ -23266,15 +24086,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Krediitkaart"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Telefoni kaart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Jäätmekäitlus"
@@ -23283,5 +24103,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Muuda jäätmekäitlusjaam"
@@ -23289,63 +24109,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "Battareid"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "Riided"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "Klaas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "Paber"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "Vanaraud"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+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:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr "Materjal"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr "kivi"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr "plastikust"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr "Värv"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr "must"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr "pruun"
@@ -23424,5 +24255,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -23432,31 +24263,31 @@
 msgstr "roheala"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr "punane"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr "sinine"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr "hall"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr "valge"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr "Jahikantsel"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr "Muuda jahiala"
@@ -23465,30 +24296,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "Kõrgus"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr "madal"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr "pool"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr "täis"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr "Peida"
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr "Lukusta"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "Purskaev"
@@ -23497,10 +24328,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "Vali purskaev"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "Joogi vesi"
@@ -23509,10 +24340,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Vali joogivee asukoht"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr ""
@@ -23520,15 +24364,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Poed"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr ""
@@ -23536,10 +24380,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr ""
@@ -23548,28 +24392,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "Vali Supermarket"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr "Nurgakauplus"
@@ -23577,9 +24421,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr "Vali nurgakauplus"
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -23587,27 +24431,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "Vali kiosk"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr ""
@@ -23615,5 +24459,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr ""
@@ -23621,88 +24465,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr "ühistranspordi_piletid"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr "ühistranspordi_plaanid"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr "parkimis_pilet"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "toit"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "joogid"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "maiustused"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "suitsud"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "fotod"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "looma_toit"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "ajalehed"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "mänguasjad"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "templid"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "SIM-kaardid"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr "telefoni_kaardid"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "kondoomid"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr "tampoonid"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "Lihunik"
@@ -23710,9 +24554,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Vali lihunik"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "Pagar"
@@ -23720,9 +24564,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Vali pagar"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "Lilleseadja"
@@ -23730,18 +24574,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "Vali lilleseadja"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr "Ökokaubad"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr "Redigeeri ökopoodi"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -23749,54 +24593,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr "Redigeeri alkoholi poode"
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr "Joogipood"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr "Arvuti"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "Vali arvutipood"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr "Elektroonika"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "Vali elektroonika pood"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr "Mööbel"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "Vali mööblipood"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr "Aiakeskus"
@@ -23804,9 +24648,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr "Vali aiakeskus"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr "Riistvara"
@@ -23814,9 +24658,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr "Vali riistvara pood"
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -23824,54 +24668,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr "Kirjatarbed"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr "Vali kirjatarvete pood"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "Juuksur"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "Vali juuksur"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr "Jalatsid"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "Vali jalatsi pood"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr "Mänguasjad"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "Vali mänguasja pood"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr "Vali video pood"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Kuiir puhastus"
@@ -23879,9 +24723,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Vali kiirpuhastus"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Pesumaja"
@@ -23889,9 +24733,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Vali pesumaja"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr "Välisuks"
@@ -23899,28 +24743,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr "Vali välisukse pood"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr "Vali spordi pood"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr "Optik"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "Vali optika"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Sularaha"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Pank"
@@ -23928,14 +24772,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Vali Pank"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "Sularaha automaat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Raha vahetus"
@@ -23943,5 +24787,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Vali rahavahetus punkt"
@@ -23949,15 +24793,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Vali sularaha automaat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Tervis"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "Arstid"
@@ -23965,18 +24809,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "Vali arstid"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "Hambaarst"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "Vali hambaarst"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Apteek"
@@ -23984,5 +24828,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Vali Apteek"
@@ -23990,9 +24834,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr "Retseptuur"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Haigla"
@@ -24000,10 +24844,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Vali haigla"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr "Hädaabi tugijaam"
@@ -24012,5 +24856,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr "Vali hädaabi tugijaam"
@@ -24019,20 +24863,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr "Punkti number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr "Punkti nimi"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "Telefoninumber"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -24040,5 +24884,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "Loomaarst"
@@ -24047,64 +24891,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "Vali loomaarst"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr "Geograafia"
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Asukohad"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Vali kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "Maa"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Vali maa"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "Riik"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "Vali riik"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "Regioon"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "Vali regioon"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr "Maakond"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr "Vali maakond"
@@ -24112,15 +24956,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "Linn"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "Vali linn"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "Linn"
@@ -24128,10 +24972,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "Muuda linna"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "Linnaosa"
@@ -24139,25 +24983,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "Muuda linnaosa"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Küla/Alevik/Alev"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Muuda küla/alevik/alev"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "Küla"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "Muuda küla"
@@ -24165,5 +25009,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr "Asustamata koht"
@@ -24171,10 +25015,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr "Muuda asustamata kohta"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "Saar"
@@ -24182,10 +25026,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Muuda saart"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr ""
@@ -24193,5 +25037,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr ""
@@ -24199,5 +25043,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "Koobas"
@@ -24205,10 +25049,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "Muuda koobast"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Mäetipp"
@@ -24216,10 +25060,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Muuda mäetippu"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "Liustik"
@@ -24227,10 +25071,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "Muuda liustikku"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "Vulkaan"
@@ -24238,70 +25082,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "Muuda vulkaani"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Piirid"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "Riiklikud"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "Muuda riiklikke piire"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "Administratiivpiir"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "Muuda administratiivpiire"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr "Omavalitsus"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr "Muuda omavalitsuse piire"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr "Valimisringkond"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "Muuda valimisringkonda"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr "Rahvuspark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "Muuda rahvuspargi piire"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Maakasutus"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Üksik puu"
@@ -24310,15 +25154,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Muuda puud"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "Botaaniline nimi"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "Mets"
@@ -24327,5 +25171,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "Muuda metsa"
@@ -24333,17 +25177,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "okasmets"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "lehtmets"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "segamets"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "Kultuurmets"
@@ -24352,14 +25196,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "Muuda kultuurmetsa"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "Looduskaitseala"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "Muuda looduskaitseala"
@@ -24367,25 +25211,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr "klibu, rusukalle"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr "Muuda rusukallet"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr "Võsa"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr "Muuda võsa"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr "Langus"
@@ -24393,10 +25237,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr "Muuda langust"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr "Nõmm"
@@ -24404,5 +25248,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "Muuda nõmme"
@@ -24410,5 +25254,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr "Taluõu"
@@ -24417,45 +25261,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr "Muuda taluõue"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "Talumaa"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr "Muuda talumaad"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr "Niit/Karjamaa"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr "Muuta niitu"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "Viinapuuistandus"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "Muuda viinapuuistandust"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr "Eraldised"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr "Muuda eraldisi"
@@ -24463,25 +25307,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "Aed"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "Muuda aeda"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "Muru"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr "Muuda muru"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr "Külatanum"
@@ -24489,10 +25333,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr "Muuda külatanumat"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr "Avalik maa"
@@ -24500,20 +25344,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr "Muuda avalikku maad"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "Muuda parki"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr "Puhkeala"
@@ -24521,5 +25365,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr "Muuda puhkeala"
@@ -24527,15 +25371,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "Elamurajoon"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr "Muuda elamurajooni"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "Matmispaik"
@@ -24543,9 +25387,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Muuda matmispaika"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "Kalmistu"
@@ -24553,39 +25397,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "Muuda kalmistut"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "Kaubandus"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr "Muuda kaubandust"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "Kommerts"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr "Muuda kommertspiirkonda"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "Tööstus"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr "Muuda tööstuspiirkonda"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr "Raudtee"
@@ -24593,15 +25437,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr "Muuda raudteed"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "Militaarala"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr "Muuda militaarala"
@@ -24609,50 +25453,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "Ehitustanner"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "Muuda ehitustandrit"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr "Jäätmaa"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr "Muuda jäätmaad"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr "Roheala"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr "Muuda roheala"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr "Prügimägi"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr "Muuda prügimäge"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "Kivimurd"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "Muuda kivimurdu"
@@ -24662,5 +25506,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr "Muuda hulknurka"
@@ -24669,10 +25513,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr "väline osa"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr "siseosa"
@@ -24680,5 +25524,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr "Pöördekeelud"
@@ -24687,5 +25531,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr "Muuda pöördekeelde"
@@ -24693,34 +25537,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr "Keelud"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr "vasakpöörde keeld"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr "parempöörde keeld"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr "ei tohi otse sõita"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr "ei tohi tagasi pöörata"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr "ainult parempööre"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr "ainult vaskpööre"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr "ainult otsesõit"
@@ -24729,15 +25573,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr "teelt"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 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:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr "teele"
@@ -24745,5 +25589,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr "Teekond"
@@ -24752,5 +25596,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr "Muuda teekonda"
@@ -24758,5 +25602,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr "teekonna tüüp"
@@ -24847,5 +25691,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -24855,17 +25699,17 @@
 msgstr "jalgrattaga"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr "tee"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr "praam"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr "suusad"
@@ -24925,5 +25769,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -24932,9 +25776,9 @@
 msgstr "jalgsi"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr "tramm"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr "ümbersõit"
@@ -24948,10 +25792,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "metroo"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr "sümboolne kirjeldus"
@@ -24959,31 +25803,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr "Võrk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr "planeeritud"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr "täiendav"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr "ajutine"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr "ühendus"
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr "Värv (hex)"
@@ -24992,107 +25836,32 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr "teekonna osa"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr "edasisuunaline osa"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr "tagasisuunaline osa"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr "peatuspunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr "edasisuunaline peatuspunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 msgid "backward halt point"
 msgstr "tagasisuunaline peatuspunkt"
-
-#. <!--
-#. 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 "standard"
 
 #. mappaint style named "standard"
@@ -25628,77 +26397,4 @@
 msgid "highway_track"
 msgstr "teerada"
-
-#. 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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
-msgstr "raudtee"
 
 #. color rail
@@ -26086,7 +26782,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "baptist"
+msgstr ""
 
 #. color manmade
@@ -29225,15 +29920,395 @@
 msgstr "Sitsiilia - Itaalia"
 
+#~ msgid "Upload to OSM..."
+#~ msgstr "Lae OSMi serverisse"
+
+#~ msgid "Move"
+#~ msgstr "Liiguta"
+
+#~ msgid "Data Layer"
+#~ msgstr "Andmekiht"
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Vali enne järjehoidja."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Tundmatu faililaiend."
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Ühtegi dokumenti pole avatud! Midagi pole salvestada."
+
+#~ msgid "Email"
+#~ msgstr "E-post"
+
+#~ msgid "Load Selection"
+#~ msgstr "Lae valik"
+
+#~ msgid "Downloading..."
+#~ msgstr "Allalaadimine..."
+
+#~ msgid "Delete the selected layer."
+#~ msgstr "Kustuta valitud kiht"
+
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "pilt"
+#~ msgstr[1] "pildid"
+
+#~ msgid "Image"
+#~ msgstr "Pilt"
+
+#~ msgid "Sync clock"
+#~ msgstr "Sünkroniseeri kell"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Salvestamata muudatused"
+
+#~ msgid "Cannot open preferences directory: {0}"
+#~ msgstr "Ei suuda avada eelistuste kataloogi: {0}"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Viga parsimisel"
+
+#~ msgid "their version:"
+#~ msgstr "nende versioon:"
+
+#~ msgid "my version:"
+#~ msgstr "minu versioon:"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
+
+#~ msgid "Do not show again"
+#~ msgstr "Rohkem ei näidata"
+
+#~ msgid "Please report a ticket at {0}"
+#~ msgstr "Palun teata piletiga {0}"
+
+#~ msgid "Include your steps to get to the error (as detailed as possible)!"
+#~ msgstr "Lisa vea tekkimise käik (nii detailselt kui võimalik)!"
+
+#~ msgid "Be sure to include the following information:"
+#~ msgstr "Lisa kindlasti järgnev info:"
+
+#~ msgid "NullPointerException, possibly some missing tags."
+#~ msgstr "NullPointerException, arvatavasti puuduvad mõned sildid (tag)."
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Server andis sisemise vea. Vähendage pindala või proovige mõne aja pärast "
+#~ "uuesti ."
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> ei oma ref"
+
+#~ msgid "Unknown version"
+#~ msgstr "Tundmatu versioon"
+
+#~ msgid "Error during parse."
+#~ msgstr "Viga sõelumisel."
+
+#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
+#~ msgstr "Jätan tee vahele kuna see sisaldab mitte eksisteerivat : {0}\n"
+
+#~ msgid "Preparing..."
+#~ msgstr "Ettevalmistus..."
+
+#~ msgid "Uploading..."
+#~ msgstr "Üleslaadimine..."
+
+#~ msgid "Incorrect password or username."
+#~ msgstr "Vale salasõna või kasutajanimi."
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ msgstr "Vihje: Mõned muudatused tulid uute andmete üleslaadimisest."
+
+#~ msgid "Enter Password"
+#~ msgstr "Sisesta salasõna"
+
+#~ msgid "name"
+#~ msgstr "nimi"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Ei saa lugeda kohaotsingu tulemusi serverist"
+
+#~ msgid "zoom"
+#~ msgstr "suurendus"
+
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Saad kasutada hiirt või Ctrl+Nooleklahvid/./ et suurendada ja lohistada"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Kasuta eelseadet ''{0}'' grupist ''{1}''"
+
+#~ msgid "Tags (empty value deletes tag)"
+#~ msgstr "Sildid (tühi väärtus kustutab sildi)"
+
+#~ msgid "Occupied By"
+#~ msgstr "Kasutab"
+
+#~ msgid "Remove Selected"
+#~ msgstr "Eemalda valitud"
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Lisa kõik hetkel valitud objektid liikmetena"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Vajuta \"Lae uuesti\" et nimekirja uuendada"
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Ei saa serveriga ühenduda."
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Viga serveri vastuse töötlemisel."
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "Importimisel tekkisid konfliktid."
+
+#~ msgid "Revert"
+#~ msgstr "Taasta"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Taasta kõigi hetkel valitud objektide olek ajaloo nimekirjas valitud "
+#~ "versiooniks."
+
+#~ msgid "Authors: {0}"
+#~ msgstr "Autorid: {0}"
+
+#~ msgid "Merging conflicts."
+#~ msgstr "Ühendan vastuolusid."
+
+#~ msgid "Conflicts: {0}"
+#~ msgstr "Konfliktid: {0}"
+
+#~ msgid ""
+#~ "The plugin {0} seems to be broken or could not be downloaded "
+#~ "automatically."
+#~ msgstr ""
+#~ "Plugin {0} paistab olevat vigane või seda ei saa automaatselt alla "
+#~ "laadida."
+
+#~ msgid "Update"
+#~ msgstr "Uuenda"
+
+#~ msgid "Some of the nodes are (almost) in the line"
+#~ msgstr "Mõned sõlmed on enam-vähem ühel joonel."
+
+#~ msgid ""
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
+#~ msgstr ""
+#~ "Valitud teedel on erinevad kuuluvusseosed. Kas Sa oled sobitamises kindel?"
+
+#~ msgid "Combine ways with different memberships?"
+#~ msgstr "Sobita erinevate kuuluvustega teed?"
+
+#~ msgid "All the ways were empty"
+#~ msgstr "Kõik teed olid tühjad."
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Palun vali allalaadimiseks vähemalt üks toiming."
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Ainult JOSM võrguabi lehekülgi saab toimetada."
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Viga lehekülje {0} laadimisel."
+
+#~ msgid "Open in Browser"
+#~ msgstr "Ava sirvikus"
+
+#~ msgid "JOSM Online Help"
+#~ msgstr "JOSM võrguabi"
+
+#~ msgid "History of Element"
+#~ msgstr "Elemendi ajalugu."
+
+#~ msgid ""
+#~ "Please select at least one node, way or relation. Only already uploaded "
+#~ "elements have a history."
+#~ msgstr ""
+#~ "Palun vali vali vähemalt üks sõlm või tee või seos. Ainult juba üles "
+#~ "laetud elementidel on ajalugu."
+
+#~ msgid "Merge Anyway"
+#~ msgstr "Liida igal juhul."
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Liida erineva kuuluvusega sõlmed?"
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr "Valitud sõlmedel on erinevad seosed. Liida need ikkagi?"
+
+#~ msgid "unnamed"
+#~ msgstr "Nimetu"
+
+#~ msgid "Please select one or more closed ways of at least four nodes."
+#~ msgstr "Palun vali üks või rohkem suletud, vähemalt nelja sõlmega teed."
+
+#~ msgid "Only two nodes allowed"
+#~ msgstr "Ainult kaks sõlme lubatud."
+
+#~ msgid "Only one node selected"
+#~ msgstr "Ainult üks sõlm valitud."
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME parandatud)"
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Oberpfalz Geofabrik.de"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
+
+#~ msgid ""
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
+#~ msgstr ""
+#~ "Internal Error: Ei saa kontrollida tingimusi, kui ei ole kihti. Palun "
+#~ "teata sellest veast arendajaid."
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Leidub <member> element, mis ei ole seotud"
+
+#~ msgid ""
+#~ "There were problems with the following plugins:\n"
+#~ "\n"
+#~ " {0}"
+#~ msgstr ""
+#~ "Olid probleemid järgnevate pistikutega:\n"
+#~ "\n"
+#~ " {0}"
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Ei saa pistikut alla laadida: {0} kohast: {1}"
+
+#~ msgid ""
+#~ "No data to update found. Have you already opened or downloaded a data "
+#~ "layer?"
+#~ msgstr ""
+#~ "Ei leitud andmeid, mida uuendada. On sul mõni andmekiht avatud ja andmed "
+#~ "laaditud?"
+
+#~ msgid ""
+#~ "This action will require {0} individual download requests. Do you wish to "
+#~ "continue?"
+#~ msgstr "See nõuab {0} allalaadimise palvet. Soovid jätkata?"
+
+#~ msgid "Update Data"
+#~ msgstr "Uuenda andmed"
+
+#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
+#~ msgstr "Ei saanud seadetest projektsiooni lugeda. Kasutan EPSG:4326"
+
+#~ msgid "No data imported."
+#~ msgstr "Andmeid ei imporditud."
+
+#~ msgid "aqueduct"
+#~ msgstr "akvedukt"
+
+#~ msgid "Failed to initialize API. Please try again later."
+#~ msgstr "API initsialiseerimine ebaõnnestus. Palun proovige hiljem uuesti."
+
+#~ msgid "Update Selection"
+#~ msgstr "Uuenda valik"
+
+#~ msgid "Updating primitive"
+#~ msgstr "Primitiivi uuendamine"
+
+#~ msgid "Conflict detected"
+#~ msgstr "Avastatud konflikt"
+
+#~ msgid "Primitive already deleted"
+#~ msgstr "Primitiiv on juba kustutatud"
+
+#~ msgid ""
+#~ "Current number of changes exceeds the max. number of changes, current is "
+#~ "{0}, max is {1}"
+#~ msgstr "Muutuste arv ületab maksimaalse. Muutusi {0}, maksimaalselt {1}"
+
+#~ msgid "No data"
+#~ msgstr "Andmeid pole"
+
+#~ msgid "Edit Properties"
+#~ msgstr "Seadete muutmine"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "<nd> element võib olla vaid way-s."
+
 #~ msgid "Footway"
 #~ msgstr "Jalgtee"
 
+#~ msgid "Shop"
+#~ msgstr "Pood"
+
+#~ msgid "Conflicts in data"
+#~ msgstr "Konfliktid andmetes"
+
+#~ msgid "Update Plugins"
+#~ msgstr "Pistikrakenduste uuendamine"
+
+#~ msgid ""
+#~ "Activating the updated plugins failed. Check if JOSM has the permission "
+#~ "to overwrite the existing ones."
+#~ msgstr ""
+#~ "Uuendatud pistikrakenduste aktiveerimine ebaõnnestus. Kontrolli, kas "
+#~ "JOSMil on piisavalt õigusi olemasolevate pistikrakenduste "
+#~ "ülekirjutamiseks."
+
+#~ msgid "Download missing plugins"
+#~ msgstr "Lae puuduvad pistikrakendused alla"
+
+#~ msgid ""
+#~ "Try updating to the newest version of JOSM and all plugins before "
+#~ "reporting a bug."
+#~ msgstr ""
+#~ "Enne veast teatamist püüa uuendada JOSM ja kõik pistikrakendused uusima "
+#~ "versioonini."
+
+#~ msgid ""
+#~ "Enable to upload all changes in one request, disable to use one request "
+#~ "per changed primitive"
+#~ msgstr ""
+#~ "Lülita sisse kõikide muudatuste laadimiseks ühe päringuga, lülita välja "
+#~ "iga muudetud primitiivi kohta eraldi päringu kasutamiseks"
+
+#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
+#~ msgstr "Abileht puudub. Loo see <A HREF=\"{0}\">English</A>."
+
+#~ msgid ""
+#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
+#~ "\"{1}\">your language</A>."
+#~ msgstr ""
+#~ "Abileht puudub. Loo see <A HREF=\"{0}\">English</A> või <A HREF=\"{1}"
+#~ "\">eesti</A>"
+
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "parameeter ''{0}'' ei tohi olla null"
+
+#~ msgid "Could not read ''{0}''."
+#~ msgstr "Ei suutnud lugeda \"{0}\""
+
+#~ msgid "Current changeset is null. Can't upload data."
+#~ msgstr "Jooksev muutustekogum on tühi. Ei saa andmeid üles laadida."
+
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "Parameeter ''{0}'' ei tohi olla tühi"
+
 #~ msgid "Id > 0 required, got {0}"
 #~ msgstr "Nõutud on Id, mis on suurem kui null, sain {0}"
-
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "Parameeter ''{0}'' ei tohi olla tühi"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parameeter ''{0}'' ei tohi olla null"
 
 #~ msgid ""
@@ -29246,387 +30321,4 @@
 #~ "Kas oled tõesti kindel, et soovid jätkata?"
 
-#~ msgid "Conflicts in data"
-#~ msgstr "Konfliktid andmetes"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "pilt"
-#~ msgstr[1] "pildid"
-
-#~ msgid "Upload to OSM..."
-#~ msgstr "Lae OSMi serverisse"
-
-#~ msgid "Move"
-#~ msgstr "Liiguta"
-
-#~ msgid "Data Layer"
-#~ msgstr "Andmekiht"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Vali enne järjehoidja."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Tundmatu faililaiend."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Ühtegi dokumenti pole avatud! Midagi pole salvestada."
-
-#~ msgid "Email"
-#~ msgstr "E-post"
-
-#~ msgid "Load Selection"
-#~ msgstr "Lae valik"
-
-#~ msgid "Downloading..."
-#~ msgstr "Allalaadimine..."
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Kustuta valitud kiht"
-
-#~ msgid "Image"
-#~ msgstr "Pilt"
-
-#~ msgid "Sync clock"
-#~ msgstr "Sünkroniseeri kell"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Salvestamata muudatused"
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Ei suuda avada eelistuste kataloogi: {0}"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Viga parsimisel"
-
-#~ msgid "their version:"
-#~ msgstr "nende versioon:"
-
-#~ msgid "my version:"
-#~ msgstr "minu versioon:"
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
-
-#~ msgid "Do not show again"
-#~ msgstr "Rohkem ei näidata"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Palun teata piletiga {0}"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr "Lisa vea tekkimise käik (nii detailselt kui võimalik)!"
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Lisa kindlasti järgnev info:"
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "NullPointerException, arvatavasti puuduvad mõned sildid (tag)."
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Server andis sisemise vea. Vähendage pindala või proovige mõne aja pärast "
-#~ "uuesti ."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> ei oma ref"
-
-#~ msgid "Unknown version"
-#~ msgstr "Tundmatu versioon"
-
-#~ msgid "Error during parse."
-#~ msgstr "Viga sõelumisel."
-
-#~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
-#~ msgstr "Jätan tee vahele kuna see sisaldab mitte eksisteerivat : {0}\n"
-
-#~ msgid "Preparing..."
-#~ msgstr "Ettevalmistus..."
-
-#~ msgid "Uploading..."
-#~ msgstr "Üleslaadimine..."
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Vale salasõna või kasutajanimi."
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr "Vihje: Mõned muudatused tulid uute andmete üleslaadimisest."
-
-#~ msgid "Enter Password"
-#~ msgstr "Sisesta salasõna"
-
-#~ msgid "name"
-#~ msgstr "nimi"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Ei saa lugeda kohaotsingu tulemusi serverist"
-
-#~ msgid "zoom"
-#~ msgstr "suurendus"
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr ""
-#~ "Saad kasutada hiirt või Ctrl+Nooleklahvid/./ et suurendada ja lohistada"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Kasuta eelseadet ''{0}'' grupist ''{1}''"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Sildid (tühi väärtus kustutab sildi)"
-
-#~ msgid "Occupied By"
-#~ msgstr "Kasutab"
-
-#~ msgid "Remove Selected"
-#~ msgstr "Eemalda valitud"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Lisa kõik hetkel valitud objektid liikmetena"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Vajuta \"Lae uuesti\" et nimekirja uuendada"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Ei saa serveriga ühenduda."
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Viga serveri vastuse töötlemisel."
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Importimisel tekkisid konfliktid."
-
-#~ msgid "Revert"
-#~ msgstr "Taasta"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Taasta kõigi hetkel valitud objektide olek ajaloo nimekirjas valitud "
-#~ "versiooniks."
-
-#~ msgid "Authors: {0}"
-#~ msgstr "Autorid: {0}"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Ühendan vastuolusid."
-
-#~ msgid "Conflicts: {0}"
-#~ msgstr "Konfliktid: {0}"
-
-#~ msgid ""
-#~ "The plugin {0} seems to be broken or could not be downloaded "
-#~ "automatically."
-#~ msgstr ""
-#~ "Plugin {0} paistab olevat vigane või seda ei saa automaatselt alla "
-#~ "laadida."
-
-#~ msgid "Update"
-#~ msgstr "Uuenda"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Mõned sõlmed on enam-vähem ühel joonel."
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "Valitud teedel on erinevad kuuluvusseosed. Kas Sa oled sobitamises kindel?"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Sobita erinevate kuuluvustega teed?"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Kõik teed olid tühjad."
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Palun vali allalaadimiseks vähemalt üks toiming."
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Ainult JOSM võrguabi lehekülgi saab toimetada."
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Viga lehekülje {0} laadimisel."
-
-#~ msgid "Open in Browser"
-#~ msgstr "Ava sirvikus"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM võrguabi"
-
-#~ msgid "History of Element"
-#~ msgstr "Elemendi ajalugu."
-
-#~ msgid ""
-#~ "Please select at least one node, way or relation. Only already uploaded "
-#~ "elements have a history."
-#~ msgstr ""
-#~ "Palun vali vali vähemalt üks sõlm või tee või seos. Ainult juba üles "
-#~ "laetud elementidel on ajalugu."
-
-#~ msgid "Merge Anyway"
-#~ msgstr "Liida igal juhul."
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Liida erineva kuuluvusega sõlmed?"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr "Valitud sõlmedel on erinevad seosed. Liida need ikkagi?"
-
-#~ msgid "unnamed"
-#~ msgstr "Nimetu"
-
-#~ msgid "Please select one or more closed ways of at least four nodes."
-#~ msgstr "Palun vali üks või rohkem suletud, vähemalt nelja sõlmega teed."
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Ainult kaks sõlme lubatud."
-
-#~ msgid "Only one node selected"
-#~ msgstr "Ainult üks sõlm valitud."
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Palun vali peaaegu täisnurga all kohtuvad teed."
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME parandatud)"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "Oberpfalz Geofabrik.de"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Internal Error: Ei saa kontrollida tingimusi, kui ei ole kihti. Palun "
-#~ "teata sellest veast arendajaid."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Leidub <member> element, mis ei ole seotud"
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Olid probleemid järgnevate pistikutega:\n"
-#~ "\n"
-#~ " {0}"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Ei saa pistikut alla laadida: {0} kohast: {1}"
-
-#~ msgid ""
-#~ "No data to update found. Have you already opened or downloaded a data "
-#~ "layer?"
-#~ msgstr ""
-#~ "Ei leitud andmeid, mida uuendada. On sul mõni andmekiht avatud ja andmed "
-#~ "laaditud?"
-
-#~ msgid ""
-#~ "This action will require {0} individual download requests. Do you wish to "
-#~ "continue?"
-#~ msgstr "See nõuab {0} allalaadimise palvet. Soovid jätkata?"
-
-#~ msgid "Update Data"
-#~ msgstr "Uuenda andmed"
-
-#~ msgid "The projection could not be read from preferences. Using EPSG:4326"
-#~ msgstr "Ei saanud seadetest projektsiooni lugeda. Kasutan EPSG:4326"
-
-#~ msgid "No data imported."
-#~ msgstr "Andmeid ei imporditud."
-
-#~ msgid "aqueduct"
-#~ msgstr "akvedukt"
-
-#~ msgid "Failed to initialize API. Please try again later."
-#~ msgstr "API initsialiseerimine ebaõnnestus. Palun proovige hiljem uuesti."
-
-#~ msgid "Update Selection"
-#~ msgstr "Uuenda valik"
-
-#~ msgid "Updating primitive"
-#~ msgstr "Primitiivi uuendamine"
-
-#~ msgid "Conflict detected"
-#~ msgstr "Avastatud konflikt"
-
-#~ msgid "Primitive already deleted"
-#~ msgstr "Primitiiv on juba kustutatud"
-
-#~ msgid ""
-#~ "Current number of changes exceeds the max. number of changes, current is "
-#~ "{0}, max is {1}"
-#~ msgstr "Muutuste arv ületab maksimaalse. Muutusi {0}, maksimaalselt {1}"
-
-#~ msgid "No data"
-#~ msgstr "Andmeid pole"
-
-#~ msgid "Edit Properties"
-#~ msgstr "Seadete muutmine"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "<nd> element võib olla vaid way-s."
-
-#~ msgid "Shop"
-#~ msgstr "Pood"
-
-#~ msgid "Update Plugins"
-#~ msgstr "Pistikrakenduste uuendamine"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Uuendatud pistikrakenduste aktiveerimine ebaõnnestus. Kontrolli, kas "
-#~ "JOSMil on piisavalt õigusi olemasolevate pistikrakenduste "
-#~ "ülekirjutamiseks."
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Lae puuduvad pistikrakendused alla"
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr ""
-#~ "Enne veast teatamist püüa uuendada JOSM ja kõik pistikrakendused uusima "
-#~ "versioonini."
-
-#~ msgid ""
-#~ "Enable to upload all changes in one request, disable to use one request "
-#~ "per changed primitive"
-#~ msgstr ""
-#~ "Lülita sisse kõikide muudatuste laadimiseks ühe päringuga, lülita välja "
-#~ "iga muudetud primitiivi kohta eraldi päringu kasutamiseks"
-
-#~ msgid "Helppage missing. Create it in <A HREF=\"{0}\">English</A>."
-#~ msgstr "Abileht puudub. Loo see <A HREF=\"{0}\">English</A>."
-
-#~ msgid ""
-#~ "Helppage missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
-#~ "\"{1}\">your language</A>."
-#~ msgstr ""
-#~ "Abileht puudub. Loo see <A HREF=\"{0}\">English</A> või <A HREF=\"{1}"
-#~ "\">eesti</A>"
-
-#~ msgid "Could not read ''{0}''."
-#~ msgstr "Ei suutnud lugeda \"{0}\""
-
-#~ msgid "Current changeset is null. Can't upload data."
-#~ msgstr "Jooksev muutustekogum on tühi. Ei saa andmeid üles laadida."
-
 #~ msgid "All installed plugins are up to date."
 #~ msgstr "Kõik installeeritud pistikrakendused on uuendatud."
Index: applications/editors/josm/i18n/po/fi.po
===================================================================
--- applications/editors/josm/i18n/po/fi.po	(revision 19689)
+++ applications/editors/josm/i18n/po/fi.po	(revision 19698)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-19 00:01-0500\n"
-"PO-Revision-Date: 2010-01-17 00:59-0500\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-23 21:42+0000\n"
 "Last-Translator: Matti Kujala <oh1qt@sral.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-01-13 18:28+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -70,11 +70,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -237,5 +237,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -249,13 +249,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -264,5 +264,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -288,5 +291,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Yhdistä"
@@ -317,5 +320,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -382,9 +385,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -392,5 +395,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "OK"
@@ -441,6 +446,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -458,5 +463,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -465,11 +470,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -506,5 +511,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "ristiriita"
@@ -637,14 +642,14 @@
 msgstr "Valitse ainakin kaksi yhdistettävää polkua."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Kopioi"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Kopioi valitut objektit leikepöydälle."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Valitse jotain kopioitavaksi."
@@ -676,8 +681,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -686,5 +691,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -741,16 +746,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Tuonnin aikana oli {0} konfliktia."
-msgstr[1] "Tuonnin aikana oli {0} konfliktia."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "Konflikti latauksen aikana"
-msgstr[1] "Konflikti latauksen aikana"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -771,4 +775,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -778,4 +784,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Monista valinta kopioimalla ja liittämällä samantien."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Monista polku"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "Siirrä valittuja jäseniä ylöspäin"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "Taso: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "Sovita näkymä {0}:aan."
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr ""
 
 #. <button label="Info" hotkey="I">
@@ -866,10 +900,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 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] "Valittu polku ei sisällä valittua pistettä."
-msgstr[1] "Valittu polku ei sisällä kaikkia valittuja pisteitä."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -988,5 +1021,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "URL"
@@ -1138,5 +1171,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr ""
 
@@ -1150,9 +1183,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Avataan {0} tiedostoa..."
-msgstr[1] "Avataan {0} tiedostoa..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1208,7 +1241,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1222,5 +1255,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "Siirtää polun pisteitä niin, että kaikki kulmat ovat joko 90° tai 270°"
 
@@ -1258,4 +1292,8 @@
 "johtaa<br>epätoivottuun tulokseen suorakulmaisessa asettelussa.<br>Muuta "
 "projektiota päästäksesi eroon tästä varoituksesta.<br>Haluatko jatkaa?</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+msgid "Selection must consist only of ways and nodes."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
@@ -1271,4 +1309,15 @@
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "Valittuja objekteja ei voi suorakulmaistaa"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr "Valitse polkuja, joiden segmenttien välillä on melkein suora kulma."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1285,9 +1334,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151
 msgid "Delete incomplete members?"
-msgstr ""
+msgstr "Poista keskeneräiset jäsenet?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152
 msgid "Paste without incomplete members"
-msgstr ""
+msgstr "Liitä ilman keskeneräisiä jäseniä?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
@@ -1297,4 +1346,7 @@
 "incomplete primitives?"
 msgstr ""
+"Kopioitu data sisältää keskeneräisiä objekteja. Liitettäessä keskeneräiset "
+"objektit poistetaan. Haluatko varmasti liittää datan ilman keskeneräisiä "
+"objekteja?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
@@ -1374,18 +1426,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1410,12 +1462,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Virhe"
@@ -1549,5 +1602,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1755,9 +1808,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "Monista {0} pistettä {1} pisteeksi"
-msgstr[1] "Monista {0} pistettä {1} pisteeksi"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1801,5 +1854,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr ""
@@ -1849,5 +1902,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85
 msgid "Upload all changes in the active data layer to the OSM server"
-msgstr ""
+msgstr "Lähetä kaikki muutokset aktiiviselta datatasolta OSM-palvelimelle"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
@@ -1965,8 +2018,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:18
-#, fuzzy
 msgctxt "audio"
 msgid "Next Marker"
-msgstr "Seuraava kuva"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java:17
@@ -1987,14 +2039,12 @@
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:18
-#, fuzzy
 msgctxt "audio"
 msgid "Previous Marker"
-msgstr "Edellinen kuva"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
-#, fuzzy
 msgctxt "audio"
 msgid "Play previous marker."
-msgstr "Edellinen kuva"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java:14
@@ -2034,5 +2084,5 @@
 #, java-format
 msgid "Download {0} of {1} ({2} left)"
-msgstr ""
+msgstr "Ladataan {0}/{1} ({2} jäljellä)"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:87
@@ -2042,5 +2092,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:157
 msgid "Check on the server"
-msgstr ""
+msgstr "Tarkista palvelimelta"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
@@ -2048,5 +2098,5 @@
 "Click to check whether objects in your local dataset are deleted on the "
 "server"
-msgstr ""
+msgstr "Klikkaa tarkistaaksesi onko lataamasi objektit poistettu palvelimelta"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163
@@ -2071,5 +2121,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
 msgid "Deleted or moved primitives"
-msgstr ""
+msgstr "Poistetut tai siirretyt objektit"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:251
@@ -2225,6 +2275,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2274,4 +2324,6 @@
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
+"Vapauta hiiren painike lopettaaksesi siirron. Paina ctrl-näppäintä "
+"yhdistääksesi lähimpään pisteeseen."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
@@ -2284,4 +2336,7 @@
 "Ctrl to rotate selected; or change selection"
 msgstr ""
+"Muuta valintaa; Siirrä objekteja raahaamalla; Pidä shift-näppäintä pohjassa "
+"lisätäksesi valintaan (ctrl-näppäimellä poistaa valinnasta; Pyöritä "
+"objekteja ctrl ja shift -näppäimet pohjassa raahamalla"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
@@ -2303,7 +2358,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
-#, fuzzy
 msgid "<not>"
-msgstr "pohjoinen"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
@@ -2345,5 +2399,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Etsi objekteja."
@@ -2425,5 +2479,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125
 msgid "<b>foot:</b> - key=foot set to any value."
-msgstr ""
+msgstr "<b>foot:</b> - avain 'foot' asetettuna"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:126
@@ -2541,5 +2595,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Etsi"
@@ -2551,5 +2605,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:157
 msgid "Start Search"
-msgstr ""
+msgstr "Aloita haku"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:279
@@ -2571,5 +2625,5 @@
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
-msgstr ""
+msgstr "Valinnasta ei löytynyt mitään hakusanalla \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:295
@@ -2579,12 +2633,11 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "E"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
@@ -2592,10 +2645,10 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2608,9 +2661,9 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2743,9 +2796,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "Lisättiin {0} objekttia"
-msgstr[1] "Lisättiin {0} objekttia"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2795,12 +2848,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "Poista \"{0}\" polusta \"{1}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Aseta {0}={1} kohteelle {2} {3}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2858,17 +2911,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Poistotila"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Poista {0} polku"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Poista {0} relaatio"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2914,5 +2967,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443
 msgid "Delete confirmation"
-msgstr ""
+msgstr "Poiston vahvistus"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46
@@ -2949,9 +3002,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "Lisättiin {0} objekttia"
-msgstr[1] "Lisättiin {0} objekttia"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -2999,9 +3052,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "Undelete {0} primitive"
 msgid_plural "Undelete {0} primitives"
-msgstr[0] "{0} objektiin"
-msgstr[1] "{0} objektiin"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
@@ -3016,7 +3069,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Poistetaanko valinta relaatiosta {0}?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3263,5 +3316,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3269,5 +3322,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3275,5 +3328,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3281,5 +3334,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3358,15 +3411,13 @@
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "WC"
+msgstr ""
 
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
-#, fuzzy
 msgctxt "filter"
 msgid "I"
-msgstr "ID"
+msgstr ""
 
 #. column header: filter mode
@@ -3391,8 +3442,7 @@
 #. filter mode: remove
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212
-#, fuzzy
 msgctxt "filter"
 msgid "D"
-msgstr "ID"
+msgstr ""
 
 #. filter mode: in selection
@@ -3402,19 +3452,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3423,5 +3473,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3429,5 +3479,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3448,5 +3498,5 @@
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
-msgstr ""
+msgstr "Ei voitu lisätä pistettä {0} keskeneräiseen polkuun {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
@@ -3552,6 +3602,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3561,5 +3611,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3570,7 +3620,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3592,5 +3642,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "tausta"
@@ -3615,5 +3665,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Epsg4326.java:26
 msgid "WGS84 Geographic"
-msgstr ""
+msgstr "WGS84 maantieteellinen"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/GaussLaborde_Reunion.java:220
@@ -3630,5 +3680,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:137
 msgid "Lambert 4 Zones (France)"
-msgstr ""
+msgstr "Lambert 4 aluetta (Ranska)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:249
@@ -3646,23 +3696,23 @@
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
-msgstr ""
+msgstr "{0} ({1}-{2} astetta)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
 #, java-format
 msgid "{0} (Corsica)"
-msgstr ""
+msgstr "{0} (Korsika)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:260
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:193
 msgid "Lambert CC Zone"
-msgstr ""
+msgstr "Lambert CC-alue"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertCC9Zones.java:133
 msgid "Lambert CC9 Zone (France)"
-msgstr ""
+msgstr "Lambert CC9-alue (Ranska)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/LambertEST.java:96
 msgid "Lambert Zone (Estonia)"
-msgstr ""
+msgstr "Lamber-alue (Viro)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Mercator.java:37
@@ -3672,30 +3722,30 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
-msgstr ""
+msgstr "PUWG (Puola)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:106
 msgid "PUWG Zone"
-msgstr ""
+msgstr "PUWG-alue"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
 msgid "PUWG 1992 (Poland)"
-msgstr ""
+msgstr "PUWG 1992 (Puola)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
-msgstr ""
+msgstr "PUWG 2000 -alue {0} (Puola)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
 msgid "Swiss Grid (Switzerland)"
-msgstr ""
+msgstr "Swiss Grid (Sveitsi)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:349
 msgid "UTM"
-msgstr ""
+msgstr "UTM"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
 msgid "UTM Zone"
-msgstr ""
+msgstr "UTM-alue"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25
@@ -3713,5 +3763,5 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:386
 msgid "UTM 20N (France)"
-msgstr ""
+msgstr "UTM 20N (Ranska)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:398
@@ -3732,8 +3782,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39
 msgid "Do not show again (remembers choice)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+msgstr "Älä näytä uudestaan (muistaa valinnan)"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3741,37 +3791,38 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "keskeneräinen"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "tie"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "rata"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "vesiväylä"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "maankäyttö"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3780,10 +3831,10 @@
 msgstr[1] "{0} pistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+msgstr "julkinen liikenne"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3792,5 +3843,5 @@
 msgstr[1] "{0} jäsentä"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3827,6 +3878,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Ristiriita"
@@ -3837,7 +3888,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-#, fuzzy
-msgid "Authorization Failed"
-msgstr "Yhteys epäonnistui"
+msgid "Authorisation Failed"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
@@ -4034,5 +4084,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Alustetaan"
@@ -4040,9 +4089,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
 msgid "Updating plugins..."
-msgstr ""
+msgstr "Päivitetään liitännäisiä..."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:176
 msgid "Installing updated plugins"
-msgstr ""
+msgstr "Asennetaan päivitetyt liitännäiset"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:180
@@ -4073,5 +4122,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4082,5 +4131,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Muokkaa"
@@ -4151,29 +4200,29 @@
 msgstr "skaalaus"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Pituusaste osoittimen kohdalla."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The name of the object at the mouse pointer."
 msgstr "Osoittmen kohdalla olevan objektin nimi."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Leveysaste osoittimen kohdalla."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 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:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Piirrettävän segmentin suuntima."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 msgid "The length of the new way segment being drawn."
 msgstr "Piirrettävän segmentin pituus."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4181,9 +4230,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(ei objektia)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4343,9 +4392,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Tagit ({0} konfliktia)"
-msgstr[1] "Tagit ({0} konfliktia)"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
@@ -4407,16 +4456,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4610,10 +4659,14 @@
 #: ../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:67
-#, fuzzy
+msgstr "Piste"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr "Yhdistää pisteet vanhimpaan."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4684,5 +4737,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:107
 msgid "Coordinates:"
-msgstr ""
+msgstr "Koordinaatit:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:182
@@ -4761,5 +4814,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr ""
@@ -4805,5 +4858,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -4933,10 +4991,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "ei mitään"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "kaikki"
@@ -4966,7 +5024,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-#, fuzzy, java-format
+#, java-format
 msgid "Tag collection does not include the selected value ''{0}''."
-msgstr "Valittu polku ei sisällä valittua pistettä."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
@@ -5016,7 +5074,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -5026,6 +5084,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5206,10 +5264,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5229,18 +5287,18 @@
 msgstr "Komentolista: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Selvitä"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5273,5 +5331,5 @@
 "<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.Click <strong>{0}</strong> to close anyway."
+"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.</"
@@ -5297,5 +5355,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5304,5 +5362,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5382,43 +5440,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Tasot"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 msgid "Open a list of all loaded layers."
 msgstr "Avaa lista kaikista ladatuista tasoista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Näytä/piilota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Monista polku"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 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:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Siirrä valittu taso rivi alaspäin."
@@ -5432,6 +5495,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Relaatiot"
@@ -5441,69 +5504,69 @@
 msgstr "Avaa lista kaikista relaatioista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relaatiot: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Avaa valittu relaatio muokkaimeen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Poista valittu relaatio"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Luo uusi relaatio"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Tämänhetkinen valinta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Avaa valintaikkuna."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Sovita näkymä valittuihin kohteisiin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Sovita näkymä valintaan"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Valinta: Rel.:{0}/Polut:{1}/Pisteet:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5511,5 +5574,5 @@
 msgstr "Valinta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5864,8 +5927,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -5937,4 +5998,7 @@
 #. <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 />
@@ -6013,6 +6077,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6054,6 +6119,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6522,152 +6589,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Nimi"
@@ -6735,5 +6804,5 @@
 #, java-format
 msgid "{0} [incomplete]"
-msgstr ""
+msgstr "{0} [keskeneräinen]"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41
@@ -7051,5 +7120,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<eri>"
@@ -7104,55 +7173,55 @@
 msgstr "Lisää ominaisuuksia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Ominaisuudet: {0} / Jäsenyydet: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Ominaisuudet / Jäsenyydet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Muuta relaatiota"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "Poista relaatiosta"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Poistetaanko valinta relaatiosta {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Poista valittu avain kaikista objekteista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "Poista asetukset"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Lisää uusi arvo/avain-pari kaikkiin objekteihin"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Muokkaa valitun avaimen arvoa kaikissa objekteissa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7222,6 +7291,6 @@
 msgid "Downloading {0} incomplete child of relation ''{1}''"
 msgid_plural "Downloading {0} incomplete children of relation ''{1}''"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Ladataan {0} relaation \"{1}\" keskeneräinen jäsen"
+msgstr[1] "Ladataan {0} relaation \"{1}\" keskeneräistä jäsentä"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
@@ -7443,5 +7512,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217
 msgid "Download all incomplete members"
-msgstr ""
+msgstr "Lataa kaikki keskeneräiset jäsenet"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
@@ -7457,5 +7526,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1252
 msgid "Download selected incomplete members"
-msgstr ""
+msgstr "Lataa valitut keskeneräiset jäsenet"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1291
@@ -7479,7 +7548,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
-#, fuzzy
 msgid "Do you really want to apply the new role?"
-msgstr "Sallitaanko tämä?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
@@ -7595,47 +7663,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Kirjanmerkit"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../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:187
+#: ../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:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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:212
+#: ../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:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr ""
@@ -7759,18 +7826,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -7781,34 +7848,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
 msgid "Enter a place name to search for:"
 msgstr "Syötä haettavan paikan nimi:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+#: ../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:147
+#: ../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:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr ""
@@ -7819,7 +7886,9 @@
 #. 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" />
@@ -7828,10 +7897,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Tyyppi"
@@ -7840,5 +7910,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -7850,17 +7920,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "tuntematon"
@@ -8212,5 +8281,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr ""
@@ -8664,9 +8733,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8676,7 +8745,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -8688,16 +8757,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "Taso"
@@ -9124,68 +9193,68 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "gps-piste"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Muokkaa viivanpiirtotyyliä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../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:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Muokkaa väriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Oletusarvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Valitse väri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Tuo äänitiedosto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9195,23 +9264,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Ääniaaltotiedostot (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Tuo kuvia"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9221,5 +9290,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9227,5 +9296,5 @@
 msgstr "Nimi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9233,5 +9302,5 @@
 msgstr "Kuvaus: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9241,23 +9310,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "Kuvaus"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Pituus: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9266,5 +9335,5 @@
 msgstr[1] "{0} reittiä, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9273,10 +9342,10 @@
 msgstr[1] "{0} reittipistettä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Muuta datatasoksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9286,43 +9355,43 @@
 "haitallisena.<br>Jos haluat lähettää jälkiä, katso:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Muutettu jäljestä {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "Lataa data OSM-palvelimelta tämän jäljen varrelta"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Lataa kaikki  alueella:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "Yhden pyynnön enimmäisalue:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} neliökilometriä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9331,9 +9400,9 @@
 msgstr "<html>Tämä vaatii {0} erillistä latauspyyntöä.<br>Jatketaanko?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 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:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9341,5 +9410,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9347,23 +9416,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datataso {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "ladatun alueen ulkopuolella"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9372,5 +9441,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9384,5 +9453,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9395,11 +9464,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9408,32 +9477,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} koostuu:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Muuta GPX-tasoksi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9482,28 +9551,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "GPS-pisteet"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX-tiedostot (*.gpx, *.gpx.gx)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Virhe tulkittaessa {0}:aa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Ei voitu lukea \"{0}\":aa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9514,34 +9582,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:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr "Kuvausaika (kuvan EXIF-tiedoista):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 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:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [pp/kk/vvvv tt:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "Ei päivämäärää"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr "Avaa toinen kuva"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9551,64 +9619,64 @@
 "Ole hyvä ja syötä aika pyydetyssä muodossa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "Virheellinen päivämäärä"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr "<Ei ladattuja GPS-jälkiä>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr "GPX-jälki: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr "Avaa toinen GPX-jälki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr "Aikavyöhyke: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9618,45 +9686,45 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr "Kohdista kuvia GPX-jälkeen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr "Virheellinen aikavyöhyke"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9665,5 +9733,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9671,22 +9739,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 msgid "The selected photos do not contain time information."
-msgstr "Valittu polku ei sisällä valittua pistettä."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -9695,17 +9762,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:980
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr "Valitse GPX-jälki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr "GPX-jälkeä ei valittuna"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9714,5 +9781,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9721,75 +9788,75 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "Hakee sijaintitietoja kuvien EXIF-tiedoista"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr "Tutkii hakemistoa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "Luetaan kuvia..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Luetaan {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Tutkii hakemistoa {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Geo-merkityt kuvat"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr "Sijoittele GPX-tiedoston mukaisesti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "Ei dataa ladattuna."
-msgstr[1] "Ei dataa ladattuna."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
+#, java-format
 msgid "{0} was found to be GPS tagged."
 msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] "{0} kuvasta löytyi gps-sijaintitiedot."
-msgstr[1] "{0} kuvasta löytyi gps-sijaintitiedot."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -9798,5 +9865,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -9893,5 +9960,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -9899,5 +9966,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -9906,29 +9973,29 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "Tahdista ääni"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 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:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr "Ääni tahdistettu pisteessä {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -9936,17 +10003,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Näytä/piilota teksti/kuvakkeet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
+#: ../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 "
@@ -9954,5 +10021,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -9960,5 +10027,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr ""
@@ -9984,5 +10051,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
 #, java-format
 msgid ""
@@ -9990,5 +10057,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
 #, java-format
 msgid ""
@@ -10040,7 +10107,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
 msgid "Authorize URL:"
-msgstr "Tekijä"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10130,7 +10196,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
 msgid "Authorize now"
-msgstr "Tekijä"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10189,7 +10254,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
-#, fuzzy
 msgid "OAuth authorization failed"
-msgstr "Yhteys epäonnistui"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
@@ -10269,7 +10333,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
 msgid "Please select an authorization procedure: "
-msgstr "Valitse ainakin neljä pistettä."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10279,7 +10342,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
-#, fuzzy
 msgid "Close the dialog and cancel authorization"
-msgstr "Sulje ikkuna ja peruuta lataus"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
@@ -10592,5 +10654,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Ole hyvä ja valitse muokattava rivi."
@@ -10604,5 +10666,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10741,9 +10803,4 @@
 msgstr "Piirtotyyli {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "Taso: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -10773,6 +10830,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr ""
@@ -10797,5 +10854,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:149
 msgid "Draw a circle form HDOP value."
-msgstr ""
+msgstr "Piirrä ympyrä HDOP-arvosta"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:46
@@ -10811,8 +10868,8 @@
 msgstr "Valittu väri (muutettavissa tasokohtaisesti)"
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Auto"
@@ -10834,13 +10891,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Polkupyörä"
@@ -10873,12 +10930,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "Jalankulku (foot)"
@@ -11117,6 +11174,6 @@
 msgid "The following plugin has been downloaded <strong>successfully</strong>:"
 msgid_plural "The following {0} plugins have been downloaded successfully:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Liitännäinen on ladattu <strong>onnistuneesti</strong>:"
+msgstr[1] "{0} liitännäistä on ladattu <strong>onnistuneesti</strong>:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
@@ -11125,10 +11182,10 @@
 msgid_plural ""
 "Downloading the following {0} plugins has <strong>failed</strong>:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Littännäisen lataus <strong>epäonnistui</strong>:"
+msgstr[1] "{0}:n littännäisen lataus <strong>epäonnistui</strong>:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
 msgid "Search:"
-msgstr ""
+msgstr "Etsi:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:119
@@ -11164,9 +11221,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:296
 msgid "Download list"
-msgstr ""
+msgstr "Lataa lista"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:297
 msgid "Download the list of available plugins"
-msgstr ""
+msgstr "Lataa lista saatavilla olevista liitännäisistä"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:326
@@ -11178,9 +11235,9 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:745
 msgid "Update plugins"
-msgstr ""
+msgstr "Päivitä liitännäiset"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:327
 msgid "Update the selected plugins"
-msgstr ""
+msgstr "Päivitä valitut liitännäiset"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:379
@@ -11223,5 +11280,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
-#, fuzzy
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11237,13 +11293,4 @@
 "keyboard...</p>"
 msgstr ""
-"<p>Huomaathan, että seuraavan sivun listassa on myös näppäimiä, joita ei "
-"ehkä löydy näppäimistöltäsi. Käytä vain näppäimiä, jotka löytyvät "
-"näppäimistöltäsi. Esimerkiksi, jos näppäimistölläsi ei ole Copy-näppäintä "
-"(joka löytyy Sun-koneiden näppäimistöiltä muttei pc-näppäimistöiltä), älä "
-"valitse sitä. Listassa on myös merkkejä, jotka saat näppäinyhdistelmien "
-"takaa: älä käytä niitäkään vaan vain kunkin näppäimen perusmerkitystä. "
-"Esimerkki: ';' on englantilaisella näppäimistöllä yksi näppäin mutta "
-"suomalaisella näppäimistöllä vaihto+\",\" . JOSM ei voi erottaa näitä ja "
-"näiden käyttö voi johtaa väärien toimintojen suorittamiseen.</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
@@ -11857,5 +11904,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -11863,18 +11917,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "Lisäominaisuudet:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tuntematon tyyppi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -11885,16 +11939,16 @@
 msgstr "Tagien esiasetuslähdettä ei voitu lukea: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Virhe käsiteltäessä {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -11903,18 +11957,17 @@
 msgstr[1] "Muuta {0} objektia"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "Ei mitään valittuna!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "Valinta ei ole sopiva!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Muuta ominaisuuksia"
@@ -12190,6 +12243,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12214,9 +12267,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Virhe luettaessa gpx-tiedostoa: tiedoston rakenne virheellinen."
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12232,7 +12285,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
-#, fuzzy
 msgid "Looking for image files"
-msgstr "Etsitään rantaviivaa..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
@@ -12240,7 +12292,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
@@ -12312,5 +12370,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "Tuodut koordinaatit: "
@@ -12411,9 +12469,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Lähetetään {0} objektia..."
-msgstr[1] "Lähetetään {0} objektia..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -12791,4 +12849,6 @@
 "missing in the loaded data and is therefore incomplete too."
 msgstr ""
+"Polku {0} ({1} pistettä) merkittiin keskeneräiseksi koska ainakin yksi sen "
+"pisteistä puuttui ladatusta datasta ja on siten myös keskeneräinen."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:534
@@ -12939,9 +12999,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159
-#, fuzzy, java-format
+#, java-format
 msgid "({0}/{1}) Uploading {2} object..."
 msgid_plural "({0}/{1}) Uploading {2} objects..."
-msgstr[0] "Lähetetään {0} objektia..."
-msgstr[1] "Lähetetään {0} objektia..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
@@ -13039,5 +13099,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -13046,7 +13106,5 @@
 "are:"
 msgstr[0] ""
-"{1}-liitännäinen edellyttää toimiakseen, että {0}-liitännäinen on asennettu."
 msgstr[1] ""
-"{1}-liitännäinen edellyttää toimiakseen, että {0}-liitännäinen on asennettu."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13311,5 +13369,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13317,8 +13374,4 @@
 "file a bug report."
 msgstr ""
-"Tapahtui odottamaton poikkeus.\n"
-"\n"
-"Tämä on aina ohjelmointivirhe. Jos käytät uusinta\n"
-"JOSM:n versiota, ilmoita ohjelmavirheestä."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13410,6 +13463,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -13525,6 +13578,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13533,5 +13586,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -13679,4 +13732,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr ""
@@ -13767,5 +13821,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "Talonumeroiden interpolointilinja"
@@ -14344,5 +14398,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr ""
@@ -14499,21 +14553,21 @@
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr ""
@@ -14545,9 +14599,9 @@
 msgstr "Luo kopio polusta"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -14562,13 +14616,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr "Tuo jälki GPX-tasolta"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr "Poista olemassa oleva jälki"
@@ -14577,6 +14631,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr "GPX-tasoa ei löytynyt."
@@ -14802,17 +14856,17 @@
 msgstr "Lataa kuvat uutena tasona."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:105
 msgid "Looking for shoreline..."
 msgstr "Etsitään rantaviivaa..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -14856,42 +14910,41 @@
 msgstr "Poistetaan pisteiden kaksoiskappaleet..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr "Lakewalker-ääriviiva"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "itä"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "koillinen"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "pohjoinen"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "luode"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "länsi"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "lounas"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "etelä"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "kaakko"
@@ -14947,6 +15000,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -14955,69 +15008,69 @@
 msgstr "vesi"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "rantaviiva"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "maa"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Maximum number of segments per way"
 msgstr "Enimmäismäärä segmenttejä/polku"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
+#: ../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:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Harmaan enimmäisarvo, joka tulkitaan vetenä (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../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:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Landsat-kuvien koko (pikselit/aste)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Landsat-kuvien koko (pikseleinä)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
 msgid "Shift all traces to east (degrees)"
 msgstr "Siirrä kaikkia jälkiä itään (astetta)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
 msgid "Shift all traces to north (degrees)"
 msgstr "Siirrä kaikkia jälkiä pohjoiseen (astetta)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
 msgid "Direction to search for land"
 msgstr "Suunta, josta etsitään maata"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
 msgid "Tag ways as"
 msgstr "Anna poluille tagi"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr "WMS-taso"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr "Välimuistin maksimikoko (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
 msgid "Maximum cache age (days)"
 msgstr "Välimuistin enimmäisikä (päivää)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
+#: ../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:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
@@ -15025,5 +15078,5 @@
 "250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -15033,5 +15086,5 @@
 "yksinkertaistusta). Oletusarvo 50000"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -15041,5 +15094,5 @@
 "väliltä 0-255, oletus 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -15049,26 +15102,26 @@
 "antavat enemmän pisteitä ja tarkempia jälkiä. Oletus on 0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../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-kuvien tarkkuus, pikselit/aste. Oletus on 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Landsat-kuvan koko pikseleinä. Oletus on 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Direction to search for land. Default east."
 msgstr "Mistä suunnasta etsitään maata. Oletus on itä."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
@@ -15076,33 +15129,33 @@
 "(nothing). Oletus on vesi (water)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "Käytettävä WMS-taso. Oletus on IR1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "Jokaisen välimuistihakemiston enimmäiskoko. Oletus on 300 MB."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr "Välimuistin enimmäisikä päivissä. Oletus on 100."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr "Tietolähteen nimi. Oletus on Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
-msgstr "Liitännäinen vesimassojen rajaamiseen Landsat-kuvista."
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+msgstr "Liitännäinen vesialueiden rajaamiseen Landsat-kuvista."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr "Lakevalker-liitännäisen asetukset"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:50
 msgid "Downloading image tile..."
 msgstr "Ladataan kuvaa..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr "Kuvaa ei voitu ladata"
@@ -15126,5 +15179,5 @@
 msgstr "Yhteys epäonnistui"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr ""
@@ -15155,5 +15208,5 @@
 msgstr "Kurssi"
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr "LiveGPS-taso"
@@ -15227,5 +15280,5 @@
 msgstr "Kahden pisteen välinen kulma"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr "Taso, jolla tehdään mittaukset"
@@ -15488,4 +15541,75 @@
 #: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:135
 msgid "Firefox executable"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#, fuzzy
+msgid "Read error!"
+msgstr "Tekojärvi"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Syötä uuden pisteen koordinaatit."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Säilytä varmuuskopiotiedostot"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Virhe"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "Syötettyä aikaa ei voitu tulkita oikein."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Ei voitu nimetä uudelleen tiedostoa ''{0}''"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Säilytä varmuuskopiotiedostot"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "Säilytä varmuuskopiotiedostot"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Korvaa"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+msgid "Could not delete temporary file!"
 msgstr ""
 
@@ -15761,6 +15885,6 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -15783,5 +15907,5 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 msgid "Surveyor..."
-msgstr "Etsi..."
+msgstr ""
 
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:46
@@ -15882,72 +16006,128 @@
 msgstr "Tagien esiasetuslähteet täytyy määritellä ensin asetuksissa."
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+msgid "Terrace a house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+#, fuzzy
+msgid "Interpolation"
+msgstr "Talonumeroiden interpolointilinja"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Tiet"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Karttaruutujen numerot"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Puhelinnumero"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+msgid "Lowest housenumber of the terraced house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Luo uusi relaatio"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Luo kopio polusta"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Kadunnimi"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../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:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr ""
@@ -16185,5 +16365,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr "Päällekkäiset pisteet"
@@ -16193,5 +16373,5 @@
 msgstr "Tarkistaa etteivät mitkään pisteet ole identtisissä koordinaateissa."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16203,9 +16383,9 @@
 "<br>Oletko varma, että haluat poistaa ne?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr ""
@@ -16240,5 +16420,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr ""
@@ -16390,7 +16570,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr "Virheelliset avain/arvo-parit"
@@ -16398,81 +16578,81 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr "Piirto-ongelma"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Avain \"{0}\" virheellinen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr "Tyhjät arvot"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr "Epäkelpo avain"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr "Virheellinen välilyönti avaimessa"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr "Arvossa välilyönti alussa tai lopussa"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr "Avaimen arvossa HTML-entiteettikoodeja"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr "FIXME-avain (korjattavia karttakohteita)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr "Tarkista ominaisuuksien avaimet"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 "Tarkista ominaisuuksien avaimet vertaamalla tunnettujen avainten listaan."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16483,88 +16663,88 @@
 "php/User:JLS/speller )"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr "Lisää tiedosto"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "Poista valittu lähde listasta."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "Oikeinkirjoitus- ja ominaisuustarkistimen sääntötiedostot"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr "Tarkista ominaisuuksien arvot."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 "Tarkista ominaisuuksien arvot vertaamalla esivalintojen tuntemiin arvoihin."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr "Etsi FIXME:t"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Etsii solmut ja polut joissa arvona FIXME"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr "Tarkista muokkausnäkymän piirto-ongelmat"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr "Näytä kartan muokkausnäkymän piirrossa havaitut ongelmat tai puutteet."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr "Käytä oletussääntötiedostoa."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr "Käytä tarkistimen mukana tullutta sääntötiedostoa (suositus)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr "Käytä oletusoikeinkirjoitussääntöjä."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 "Käytä tarkistimen mukana tullutta oikeinkirjoitussääntötiedostoa (suositus)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -17009,5 +17189,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -17018,13 +17198,17 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+msgid "Download visible tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -17033,50 +17217,46 @@
 "resoluutiota"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
-msgid "Download visible tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "Vaihda resoluutiota"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "Tallenna WMS-taso tiedostoon"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "Lataa WMS-taso tiedostosta"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "Virhe ladattaessa tiedostoa"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -17329,6 +17509,13 @@
 msgstr ""
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17337,15 +17524,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17354,10 +17541,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17366,15 +17553,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17384,10 +17571,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17396,5 +17583,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17403,10 +17590,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -17513,6 +17700,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -17520,6 +17716,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "Numero"
@@ -17536,5 +17733,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Kaistat"
@@ -17556,10 +17753,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Maksiminopeus (km/h)"
@@ -17603,14 +17800,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "Yksisuuntainen"
@@ -17653,13 +17850,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -17697,13 +17894,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Tunneli"
@@ -17738,13 +17935,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "Maaleikkaus"
@@ -17779,13 +17976,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "Penger"
@@ -17917,4 +18114,13 @@
 msgid "Edit Unclassified Road"
 msgstr "Muokkaa tien ominaisuuksia"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr ""
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -17932,15 +18138,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr ""
@@ -17952,5 +18158,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Asuinkatu"
@@ -17959,5 +18165,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "Muokkaa asuinkadun ominaisuuksia"
@@ -17975,16 +18181,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Pinta"
@@ -18006,166 +18215,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr "päällystetty"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr "päällystämätön"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "metsä"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr "mukulakivi"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "sora"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "ruoho"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "hiekka"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr "maa"
@@ -18173,5 +18389,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr "Pihakatu"
@@ -18180,5 +18396,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr "Muokkaa pihakadun ominaisuuksia"
@@ -18186,5 +18402,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "Kävelykatu"
@@ -18193,5 +18409,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "Muokkaa kävelykadun ominaisuuksia"
@@ -18199,5 +18415,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr ""
@@ -18206,5 +18422,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr ""
@@ -18214,18 +18430,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr ""
@@ -18233,5 +18449,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr "Pysäköintialueen ajoväylä"
@@ -18241,5 +18457,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr "Muokkaa pysäköintialueen ajoväylän ominaisuuksia"
@@ -18247,5 +18463,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "Tuntemattoman luokituksen tie"
@@ -18254,5 +18470,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "Muokkaa tietä jonka luokitusta ei vielä tiedetä"
@@ -18261,20 +18477,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "Liikennöintirajoitukset"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "Muokkaa tietä koskevia rajoituksia"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "Tietulli"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "Umpikuja"
@@ -18282,9 +18498,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 msgid "Access"
 msgstr "Pääsy (access)"
 
 #. 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"
@@ -18295,6 +18512,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18306,4 +18521,5 @@
 #. 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"
@@ -18322,141 +18538,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+msgid "yes"
+msgstr "kyllä"
+
+#. 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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "yksityinen"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:219
+msgid "destination"
+msgstr "määränpää"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr ""
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-msgid "yes"
-msgstr "kyllä"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "yksityinen"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "määränpää"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr ""
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "ei"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr "Pakettiautot (goods)"
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Raskaat ajoneuvot (3.5 tonnia) (hgv)"
@@ -18471,10 +18695,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr "Hevonen"
@@ -18490,10 +18714,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "Moottoripyörä"
@@ -18508,27 +18732,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr "Auto"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr "Julkinen liikenne (psv)"
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr "Moottorivene"
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "Vene"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Miniminopeus (km/h)"
@@ -18536,25 +18752,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "Maksimipaino (tonnia)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "Kiertoliittymä"
@@ -18565,5 +18781,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "Muokkaa kiertoliittymän/risteyksen ominaisuuksia"
@@ -18583,10 +18799,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "moottoritie"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr "moottoritien_ramppi"
@@ -18608,10 +18824,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "valtatie"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr "valtatien_ramppi"
@@ -18633,10 +18849,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "kantatie"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr "kantatien_ramppi"
@@ -18658,5 +18874,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -18671,9 +18887,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "yhdystie"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr "tie"
@@ -18687,9 +18903,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "asuinkatu"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr "pihakatu"
@@ -18719,10 +18935,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr ""
@@ -18752,5 +18968,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -18762,10 +18978,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Muokkaa sillan ominaisuuksia"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr ""
@@ -18773,19 +18989,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Polut"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "Rakennettava tie"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "Muokkaa rakennettavan tien ominaisuuksia"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "Liittymä"
@@ -18801,5 +19017,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "kiertoliittymä"
@@ -18807,5 +19023,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr "Metsätie (track)"
@@ -18814,40 +19030,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr "Muokkaa metsätien ominaisuuksia"
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "Metsätie (track)"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "sora"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "sora"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "sora"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "sora"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "sora"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr ""
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -18855,5 +19065,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -18861,27 +19071,26 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "Lähde"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
 msgstr ""
@@ -18889,5 +19098,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "Polku"
@@ -18896,12 +19105,32 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr ""
 
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
+
 #: build/trans_presets.java:489
-#, fuzzy
 msgid "Wheelchairs"
-msgstr "Pyörätuoli"
+msgstr ""
 
 #: build/trans_presets.java:490
@@ -18917,7 +19146,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "Muokkaa ratsastustien ominaisuuksia"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -18930,7 +19158,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "Muokkaa pyörätietä/kevyen liikenteen väylää"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -18965,24 +19192,21 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "Yhdistä silti"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "Muokkaa jalkakäytävän ominaisuuksia"
+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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Muokkaa jalkakäytävän ominaisuuksia"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr ""
@@ -18990,5 +19214,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "Portaat"
@@ -18998,5 +19222,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Muokkaa portaiden ominaisuuksia"
@@ -19004,10 +19228,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "Moottoritien liittymä"
@@ -19015,15 +19239,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "Muokkaa moottoritien liittymää"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr ""
@@ -19031,5 +19255,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr ""
@@ -19037,5 +19261,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -19068,17 +19293,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "Operaattori"
@@ -19087,5 +19312,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "Liikennevalot"
@@ -19095,5 +19320,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -19102,27 +19327,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "saari"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr ""
@@ -19130,6 +19355,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr ""
@@ -19138,11 +19363,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -19150,30 +19375,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr ""
@@ -19181,5 +19406,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -19188,14 +19413,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr ""
@@ -19206,14 +19477,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr "Kääntöympyrä"
@@ -19223,26 +19494,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr ""
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 msgid "Speed Camera"
 msgstr "Nopeuskamera"
 
 #. 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "Hätäpuhelin"
@@ -19250,5 +19523,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr ""
@@ -19256,5 +19529,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr ""
@@ -19262,11 +19535,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr "Kahluupaikka"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr ""
@@ -19274,5 +19554,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr ""
@@ -19280,5 +19560,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -19290,7 +19570,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr ""
@@ -19298,5 +19578,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Esteet"
@@ -19304,5 +19584,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr ""
@@ -19310,5 +19590,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr ""
@@ -19353,16 +19633,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "Sallitut kulkumuodot:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr ""
@@ -19371,5 +19651,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr ""
@@ -19377,5 +19657,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr ""
@@ -19383,10 +19663,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr ""
@@ -19394,15 +19674,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr ""
@@ -19410,5 +19690,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr ""
@@ -19416,10 +19696,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr ""
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr ""
@@ -19429,5 +19709,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr "Pensasaita"
@@ -19436,12 +19716,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:817 build/trans_presets.java:819
 msgid "Fence"
 msgstr "Aita"
 
-#. item "Barriers/Fence"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "Muuri"
@@ -19449,5 +19741,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "Kaupunginmuuri"
@@ -19456,5 +19748,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr ""
@@ -19466,15 +19758,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "Portti"
@@ -19482,50 +19775,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr ""
@@ -19533,25 +19826,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr ""
@@ -19562,11 +19855,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "Vesi"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "Lähde"
@@ -19574,5 +19867,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "Muokkaa lähteen ominaisuuksia"
@@ -19580,5 +19873,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr ""
@@ -19586,10 +19879,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr ""
@@ -19597,10 +19901,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "Kanava"
@@ -19608,10 +19912,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "Joki"
@@ -19621,5 +19925,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "Muokkaa joen ominaisuuksia"
@@ -19627,15 +19931,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Muokkaa veden ominaisuuksia"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "Maa"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "Muokkaa maan ominaisuuksia"
@@ -19643,15 +19947,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr "Tekojärvi"
@@ -19659,15 +19963,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr "Muokkaa tekojärven ominaisuuksia"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -19675,5 +19979,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "Joentörmä"
@@ -19682,10 +19986,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "Muokkaa joentörmän ominaisuuksia"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr "Kosteikko"
@@ -19696,14 +20000,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr "Muokkaa kosteikon ominaisuuksia"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "suo"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr "räme"
@@ -19717,35 +20021,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr "suo"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "Muta"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr "Muokkaa mudan ominaisuuksia"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "Ranta"
@@ -19753,20 +20057,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "Muokkaa rannan ominaisuuksia"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "Lahti"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "Muokkaa lahden ominaisuuksia"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "Kallio"
@@ -19774,10 +20078,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "Muokkaa kallion ominaisuuksia"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "Rantaviiva"
@@ -19785,5 +20089,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "Muokkaa rantaviivan ominaisuuksia"
@@ -19791,5 +20095,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "Lauttareitti"
@@ -19797,5 +20101,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr ""
@@ -19804,5 +20108,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr ""
@@ -19810,10 +20114,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "Telakka"
@@ -19821,5 +20125,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr ""
@@ -19827,5 +20131,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "Pato"
@@ -19833,15 +20137,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr "Sulkuportti"
@@ -19850,5 +20154,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr ""
@@ -19856,20 +20160,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "Vesiputous"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "Muokkaa vesiputouksen ominaisuuksia"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr ""
@@ -19878,15 +20182,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr "Venesatama"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "Laituri"
@@ -19894,10 +20198,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "Muokkaa laiturin ominaisuuksia"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr "Lauttaterminaali"
@@ -19905,10 +20209,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr "Muokkaa lauttaterminaalin ominaisuuksia"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr ""
@@ -19918,20 +20222,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "Rata"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "Rata"
@@ -19939,5 +20243,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr ""
@@ -19946,139 +20250,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr ""
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr "sivuraide"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr ""
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr ""
+
+#. item "Man Made/Power Line" text "Line reference"
+#. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
+#: build/trans_presets.java:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+msgid "Voltage"
+msgstr "Jännite"
+
+#. 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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr "Kapean raideleveyden rata"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr "Muokkaa kapean raideleveyden rataa"
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr "Monorail"
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr "Säilytetty"
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr "Muokkaa museroradan ominaisuuksia"
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr "Pikaraitiotie"
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "Metro"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "Muokkaa metron ominaisuuksia"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "Raitiotie"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "Käytöstä poistettu rata"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "Muokkaa käytöstä poistetun radan ominaisuuksia"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr ""
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr "sivuraide"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr ""
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr "Kapean raideleveyden rata"
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr "Muokkaa kapean raideleveyden rataa"
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr "Monorail"
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr ""
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr "Säilytetty"
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr "Muokkaa museroradan ominaisuuksia"
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr "Pikaraitiotie"
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr ""
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "Metro"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "Muokkaa metron ominaisuuksia"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "Raitiotie"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr ""
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "Käytöstä poistettu rata"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "Muokkaa käytöstä poistetun radan ominaisuuksia"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "Purettu rata"
@@ -20087,5 +20630,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr "Tasoristeys"
@@ -20094,5 +20637,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr "Risteys"
@@ -20102,5 +20645,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr ""
@@ -20108,5 +20651,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "Kääntöpöytä"
@@ -20115,10 +20658,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr "Köysiradat"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "Tuolihissi"
@@ -20126,10 +20676,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr "Hiihtohissi"
@@ -20137,10 +20687,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr "Muokkaa hiihtohissin ominaisuuksia"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "Köysirata"
@@ -20148,10 +20698,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "Muokkaa köysiradan ominaisuuksia"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr ""
@@ -20159,10 +20709,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20170,12 +20720,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr ""
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "Polttoaine"
@@ -20185,9 +20748,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Muokkaa huoltoaseman ominaisuuksia"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20241,32 +20861,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "Aukioloajat"
@@ -20325,94 +20945,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20424,5 +21120,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20432,5 +21128,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Muokkaa pysäköinnin ominaisuuksia"
@@ -20441,25 +21137,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "monikerroksinen"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr "maanalainen"
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr ""
@@ -20468,48 +21164,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "Maksu"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr "Invapaikkojen lukumäärä"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "Autopesula"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "Muokkaa autopesulan ominaisuuksia"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "Korjaamo"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "Muokkaa autokorjaamon ominaisuuksia"
@@ -20517,5 +21213,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "Vuokraamo"
@@ -20524,10 +21220,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "Muokkaa autovuokraamon ominaisuuksia"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr ""
@@ -20535,5 +21231,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr ""
@@ -20541,10 +21237,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "Muokkaa pyörätelineen ominaisuuksia"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr "Paikkojen lukumäärä"
@@ -20553,15 +21249,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "Muokkaa polkupyörävuokraamon ominaisuuksia"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Julkinen liikenne"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -20571,5 +21267,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -20577,5 +21273,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr ""
@@ -20583,5 +21279,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr "Rautatien seisake"
@@ -20589,5 +21285,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr "Muokkaa rautatien seisaketta"
@@ -20595,5 +21291,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "Raitiovaunupysäkki"
@@ -20602,5 +21298,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "Muokkaa raitiovaunupysäkkiä"
@@ -20608,5 +21304,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "Asemalaituri"
@@ -20615,5 +21311,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "Muokkaa laiturin asetuksia"
@@ -20625,5 +21321,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr ""
@@ -20631,10 +21327,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr "Alue"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "Metron sisäänkäynti"
@@ -20643,10 +21339,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "Muokkaa sisäänkäynnin ominaisuuksia"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr "Pyörätuoli"
@@ -20655,5 +21351,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "Linja-autoasema"
@@ -20662,5 +21358,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "Muokkaa linja-autoaseman ominaisuuksia"
@@ -20668,5 +21364,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "Linja-autopysäkki"
@@ -20676,5 +21372,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "Muokkaa linja-autopysäkin ominaisuuksia"
@@ -20683,25 +21379,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr ""
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "Penkki"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr ""
@@ -20709,5 +21406,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "Taksi"
@@ -20715,5 +21412,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "Muokkaa taksitolppaa"
@@ -20721,32 +21418,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "Lentokenttä"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr ""
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr "IATA"
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr "ICAO"
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+msgid "Beacon"
+msgstr "Loisto"
+
+#. 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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Majoittuminen"
@@ -20758,5 +21550,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotelli"
@@ -20765,15 +21557,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "Muokkaa hotellia"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "Tähdet"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr "Motelli"
@@ -20781,20 +21573,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr "Muokkaa motellin ominaisuuksia"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr "Vierasmaja"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr "Muokkaa vierasmajan ominaisuuksia"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "Alppimaja"
@@ -20802,10 +21594,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr "Hostelli"
@@ -20813,30 +21605,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr "Matkailuvaunualue"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr "Muokkaa matkailuvaunualueen ominaisuuksia"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "Leirintäalue"
@@ -20844,10 +21636,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Ruoka ja juoma"
@@ -20858,5 +21650,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ravintola"
@@ -20864,5 +21656,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "Muokkaa ravintolan ominaisuuksia"
@@ -20870,5 +21662,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr ""
@@ -20876,61 +21668,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "italialainen"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "kiinalainen"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "hampurilainen"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "kreikkalainen"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "saksalainen"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "intialainen"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "paikallinen"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "turkkilainen"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "aasialainen"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "thaimaalainen"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "meksikolainen"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "japanilainen"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "Pikaruoka"
@@ -20938,9 +21742,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "Muokkaa pikaruokalan ominaisuuksia"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "Kahvila"
@@ -20948,9 +21760,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "Muokkaa kahvilan ominaisuuksia"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr ""
@@ -20958,18 +21770,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr ""
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr ""
@@ -20977,9 +21789,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "Yökerho"
@@ -20987,24 +21799,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "Muokkaa yökerhon ominaisuuksia"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Turismi"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr "Nähtävyys"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Museo"
@@ -21012,9 +21824,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Muokkaa museon ominaisuuksia"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Eläintarha"
@@ -21023,9 +21835,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Muokkaa eläintarhan ominaisuuksia"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "Näköalapaikka"
@@ -21033,24 +21845,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "Muokkaa näköalapaikan ominaisuuksia"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "Teemapuisto"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "Taideteos"
@@ -21058,5 +21870,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr ""
@@ -21064,19 +21876,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Kartta"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr ""
@@ -21114,5 +21926,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -21120,28 +21932,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr ""
@@ -21151,5 +21963,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr ""
@@ -21157,5 +21969,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr ""
@@ -21163,6 +21975,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "Pyöräily"
@@ -21170,5 +21982,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr ""
@@ -21176,6 +21988,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr ""
@@ -21183,5 +21995,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr ""
@@ -21189,46 +22001,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr ""
@@ -21236,29 +22048,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr ""
@@ -21266,25 +22078,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "Piknik-paikka"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "Muokkaa piknik-paikan ominaisuuksia"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Historialliset paikat"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Linna"
@@ -21293,19 +22105,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Muokkaa linnan ominaisuuksia"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Rauniot"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Muokkaa raunioiden ominaisuuksia"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Arkeologinen kaivaus"
@@ -21314,9 +22126,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "Taistelukenttä"
@@ -21324,10 +22136,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr ""
@@ -21335,5 +22147,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -21341,15 +22153,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "Monumentti"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "Muistomerkki"
@@ -21357,55 +22169,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Vapaa-ajanviete"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "Vesipuisto"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "Muokkaa vesipuiston ominaisuuksia"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Leikkipuisto"
@@ -21413,35 +22225,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Muokkaa leikkipuiston ominaisuuksia"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Kalastus"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Muokkaa stadionin ominaisuuksia"
@@ -21455,6 +22267,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "Valitse urheilulaji:"
@@ -21846,6 +22658,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -21879,225 +22691,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "jousiammunta"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "australialainen jalkapallo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "koripallo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr "kuulapelit"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "kiipeily"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr "kriketti"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr "krikettiverkko"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr "kroketti"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "pyöräily"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr "ratsastus"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "amerikkalainen jalkapallo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "voimistelu"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "jääkiekko"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "ammunta"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "jalkapallo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "uinti"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "pöytätennis"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "Urheilukeskus"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "Muokkaa urheilukeskuksen ominaisuuksia"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr "Kenttä"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr "Muokkaa kentän ominaisuuksia"
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr "Kilparata"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr "Muokkaa kilparadan ominaisuuksia"
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "Golfkenttä"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "Muokkaa golf-kentän ominaisuuksia"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "Pienoisgolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "Muokkaa minigolfin ominaisuuksia"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Urheilu"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr ""
@@ -22136,21 +22948,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "tyyppi"
@@ -22189,203 +23001,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr "kenttä"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "urheilukeskus"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "Jousiammunta"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "Kiipeily"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr "Ratsastus"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "Voimistelu"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "Moottoriurheilu"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr "Muokkaa moottoriurheilun ominaisuuksia"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "Unti"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr ""
@@ -22393,56 +23205,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr ""
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "Ammunta"
@@ -22450,182 +23258,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "Pallopelit"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "Jalkapallo"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "Amerikkalainen jalkapallo"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr "Australialainen jalkapallo"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "Koripallo"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "golfkenttä"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr "Kuulapeli"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr "Muokkaa kuulapelin ominaisuuksia"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr "Kriketti"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr "Muokkaa kriketin ominaisuuksia"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr "Krikettiverkko"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr "Muokkaa krikettiverkon ominaisuuksia"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr "Kroketti"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "Jääkiekko"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "Muokkaa jääkiekkopaikan ominaisuuksia"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "Pöytätennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Rakennukset"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "Rakennus"
@@ -22633,5 +23441,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Julkinen rakennus"
@@ -22639,10 +23447,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Muokkaa julkisen rakennuksen ominaisuuksia"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "Kaupungintalo"
@@ -22650,10 +23458,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Muokkaa kaupungintalon ominaisuuksia"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Suurlähetystö"
@@ -22661,10 +23469,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Muokkaa suurlähetystön ominaisuuksia"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "Oikeustalo"
@@ -22673,10 +23481,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Muokkaa oikeustalon ominaisuuksia"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Vankila"
@@ -22685,10 +23493,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Muokkaa vankilan ominaisuuksia"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Poliisiasema"
@@ -22698,10 +23506,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Muokkaa poliisiaseman ominaisuuksia"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "Paloasema"
@@ -22710,10 +23518,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Muokkaa paloaseman ominaisuuksia"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Postitoimisto"
@@ -22721,5 +23529,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Muokkaa postitoimiston ominaisuuksia"
@@ -22727,15 +23535,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "Lastentarha"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "Muokkaa lastentarhan ominaisuuksia"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "Koulu"
@@ -22743,10 +23551,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "Muokkaa koulun ominaisuuksia"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "Yliopisto"
@@ -22754,10 +23562,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "Muokkaa yliopiston ominaisuuksia"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "Korkeakoulu"
@@ -22765,5 +23573,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "Muokkaa korkeakoulun ominaisuuksia"
@@ -22771,5 +23579,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Elokuvateatteri"
@@ -22778,10 +23586,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Muokkaa elokuvateatterin ominaisuuksia"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "Kirjasto"
@@ -22790,9 +23598,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Muokkaa kirjaston ominaisuuksia"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "Taidekeskus"
@@ -22800,10 +23608,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "Muokkaa taidekeskuksen ominaisuuksia"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Teatteri"
@@ -22812,10 +23620,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Muokkaa teatterin ominaisuuksia"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr ""
@@ -22825,5 +23633,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr ""
@@ -22832,6 +23640,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "Uskonto"
@@ -22840,66 +23648,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr ""
@@ -22908,81 +23716,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Osoitteet"
@@ -22991,5 +23799,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Muokkaa osoitetietoja"
@@ -22997,5 +23805,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "Talon numero"
@@ -23003,25 +23811,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "Talon nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Kadunnimi"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "Kaupungin nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Postinumero"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "Maakoodi"
@@ -23030,5 +23838,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "Muokkaa interpolointilinjaa"
@@ -23036,61 +23844,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "pariton"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "parillinen"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "Tehdas"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "Muokkaa tehtaan ominaisuuksia"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Torni"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Muokkaa tornin ominaisuuksia"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr ""
@@ -23098,25 +23906,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Vesitorni"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Muokkaa vesitornin ominaisuuksia"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "Kaasukello"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "Muokkaa kaasukellon ominaisuuksia"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "Majakka"
@@ -23124,10 +23932,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Muokkaa majakan ominaisuuksia"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Tuulimylly"
@@ -23135,10 +23943,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Muokkaa tuulimyllyn ominaisuuksia"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Putki"
@@ -23147,37 +23955,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Muokkaa putken ominaisuuksia"
 
-#: build/trans_presets.java:2198
-msgid "oil"
-msgstr ""
-
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
 msgid "gas"
 msgstr "kaasu"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr ""
+
+#: build/trans_presets.java:2353
+msgid "oil"
+msgstr ""
+
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "Vedenpuhdistuslaitos"
@@ -23187,10 +23995,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "Muokkaa vedenpuhdistuslaitoksen ominaisuuksia"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Nosturi"
@@ -23198,21 +24006,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Muokkaa nosturin ominaisuuksia"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr "Loisto"
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr ""
@@ -23220,10 +24023,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "Valvontakamera"
@@ -23231,11 +24034,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Muokkaa valvontakameran ominaisuuksia"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr ""
@@ -23245,35 +24060,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "tuuli"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "vesivoima"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "fossiilinen polttoaine"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "ydinvoima"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "kivihiili"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr ""
@@ -23282,10 +24097,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "Muuntamoasema"
@@ -23294,5 +24109,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "Muokkaa muuntamoaseman ominaisuuksia"
@@ -23300,10 +24115,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "Korkeajännitelinjan torni"
@@ -23314,23 +24129,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "Muokkaa korkeajännitelinjan tornin ominaisuuksia"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "Sähkölinja"
@@ -23339,79 +24154,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "Muokkaa sähkölinjan ominaisuuksia"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr ""
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "Jännite"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Käymälä"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "Postilaatikko"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Puhelin"
@@ -23420,5 +24230,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Muokkaa puhelimen ominaisuuksia"
@@ -23426,5 +24236,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Kolikot"
@@ -23432,5 +24242,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr ""
@@ -23438,5 +24248,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -23444,5 +24254,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr ""
@@ -23450,15 +24260,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Luottokortit"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Puhelinkortit"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Kierrätys"
@@ -23467,5 +24277,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Muokkaa kierrätyspisteen ominaisuuksia"
@@ -23473,63 +24283,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "Paristot"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "Peltitölkit"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "Vaatteet"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "Lasi"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "Paperi"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "Romumetalli"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+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:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr ""
@@ -23608,5 +24429,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -23616,31 +24437,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr "Metsästyslava"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr "Muokkaa metsästyslavan ominaisuuksia"
@@ -23649,30 +24470,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "Korkeus"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr "täysi"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "Lähde"
@@ -23681,10 +24502,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "Muokkaa lähteen ominaisuuksia"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "Juomavesi"
@@ -23693,10 +24514,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Muokkaa juomaveden ominaisuuksia"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr ""
@@ -23704,15 +24538,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Kaupat"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr ""
@@ -23720,10 +24554,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "Muokkaa autokaupan ominaisuuksia"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr ""
@@ -23732,28 +24566,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "Pyöräkauppa"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr "Lähikauppa"
@@ -23761,9 +24595,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr "Muokkaa lähikaupan tietoja"
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "Kioski"
@@ -23771,27 +24605,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "Muokkaa kioskin ominaisuuksia"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "Automaatti"
@@ -23799,5 +24633,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "Muokkaa automaatin tietoja"
@@ -23805,88 +24639,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "Automaatin tuotteet"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "juomat"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "Lihakauppa"
@@ -23894,9 +24728,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Muokkaa lihakaupan ominaisuuksia"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "Leipomo"
@@ -23904,9 +24738,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Muokkaa leipomon ominaisuuksia"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr ""
@@ -23914,18 +24748,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr "Luomukauppa"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr "Muokkaa luomukaupan ominaisuuksia"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr ""
@@ -23933,54 +24767,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr ""
@@ -23988,9 +24822,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr ""
@@ -23998,9 +24832,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "Tee-se-itse-kauppa"
@@ -24008,54 +24842,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "Muokkaa tee-se-itse-kaupan ominaisuuksia"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "Kampaamo"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "Muokkaa kampaamon ominaisuuksia"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Kuivapesula"
@@ -24063,9 +24897,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Muokkaa kuivapesulan ominaisuuksia"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Pesula"
@@ -24073,9 +24907,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Muokkaa pesulan ominaisuuksia"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr ""
@@ -24083,28 +24917,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "Muokkaa optikon ominaisuuksia"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Raha"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Pankki"
@@ -24112,14 +24946,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Muokkaa pankin ominaisuuksia"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "Pankkiautomaatti"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Rahanvaihto"
@@ -24127,5 +24961,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Muokkaa rahanvaihdon ominaisuuksia"
@@ -24133,15 +24967,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Muokkaa pankkiautomaatin ominaisuuksia"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Terveys"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "Lääkäri"
@@ -24149,18 +24983,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "Muokkaa lääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "Hammaslääkäri"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "Muokkaa hammaslääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Apteekki"
@@ -24168,5 +25002,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Muokkaa apteekin ominaisuuksia"
@@ -24174,9 +25008,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Sairaala"
@@ -24184,10 +25018,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Muokkaa sairaalan ominaisuuksia"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr ""
@@ -24196,5 +25030,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -24203,20 +25037,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "Puhelinnumero"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -24224,5 +25058,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "Eläinlääkäri"
@@ -24231,64 +25065,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "Muokkaa eläinlääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Paikat"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Maanosa"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Muokkaa maanosan ominaisuuksia"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "Maa"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Muokkaa maan ominaisuuksia"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "Osavaltio"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "Muokkaa osavaltion ominaisuuksia"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "Seutu"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr ""
@@ -24296,15 +25130,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "Iso kaupunki"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "Muokkaa kaupungin ominaisuuksia"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "Kaupunki"
@@ -24312,10 +25146,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "Muokkaa kaupungin ominaisuuksia"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "Kaupunginosa"
@@ -24323,25 +25157,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "Muokkaa kaupunginosan ominaisuuksia"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Kunta"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Muokkaa kunnan ominaisuuksia"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "Kylä"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "Muokkaa kylän ominaisuuksia"
@@ -24349,5 +25183,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr ""
@@ -24355,10 +25189,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "Saari"
@@ -24366,10 +25200,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Muokkaa saaren ominaisuuksia"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr ""
@@ -24377,5 +25211,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr ""
@@ -24383,5 +25217,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "Luolan suuaukko"
@@ -24389,10 +25223,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "Muokkaa luolan suuaukon ominaisuuksia"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Huippu"
@@ -24400,10 +25234,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Muokkaa huipun ominaisuuksia"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "Jäätikkö"
@@ -24411,10 +25245,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "Muokkaa jäätikön ominaisuuksia"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "Tulivuori"
@@ -24422,70 +25256,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "Muokkaa tulivuoren ominaisuuksia"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Rajat"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "Kansallinen"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "Muokkaa kansallisen rajan ominaisuuksia"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "Hallinnollinen"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "Muokkaa hallinnollisen rajan ominaisuuksia"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "Muokkaa poliittisen rajan ominaisuuksia"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "Muokkaa kansallispuiston rajan ominaisuuksia"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Maankäyttö"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Puu"
@@ -24494,15 +25328,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Muokkaa puun ominaisuuksia"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "Kasvitieteellinen nimi"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "Metsä"
@@ -24511,5 +25345,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "Muokkaa metsän ominaisuuksia"
@@ -24517,17 +25351,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "havumetsä"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "lehtimetsä"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "sekametsä"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "Talousmetsä"
@@ -24536,14 +25370,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "Muokkaa talousmetsän ominaisuuksia"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "Luonnonsuojelualue"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -24551,25 +25385,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr "Kivikko, rakka"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr "Muokkaa kivikon ominaisuuksia"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr "Pusikko"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr "Muokkaa pusikon ominaisuuksia"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr "Tunturi"
@@ -24577,10 +25411,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr "Muokkaa tunturin ominaisuuksia"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr "Nummi"
@@ -24588,5 +25422,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "Muokkaa nummen ominaisuuksia"
@@ -24594,5 +25428,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr "Maatilan piha/työskentelyalue (muu kuin pelto)"
@@ -24601,45 +25435,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr "Muokkaa maatilan pihan ominaisuuksia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "Peltoalueet"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "Viinitarha"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "Muokkaa viinitarhan ominaisuuksia"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr "Siirtolapuutarha"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr "Muokkaa siirtolapuutarhan ominaisuuksia"
@@ -24647,25 +25481,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "Puutarha"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "Ruoho"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr "Muokkaa ruohon ominaisuuksia"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr ""
@@ -24673,10 +25507,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr ""
@@ -24684,20 +25518,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "Puisto"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "Muokkaa puiston ominaisuuksia"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr ""
@@ -24705,5 +25539,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -24711,15 +25545,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "Asuinalue"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr "Muokkaa asuinalueen ominaisuuksia"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "Hautausmaa (pieni)"
@@ -24727,9 +25561,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Muokkaa pienen hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "Hautausmaa"
@@ -24737,39 +25571,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "Muokkaa hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "Kaupallinen"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr "Muokkaa kaupallisen alueen ominaisuuksia"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "Toimistoalue"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr "Muokkaa toimistoalueen ominaisuuksia"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "Teollisuusalue"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr "Muokkaa teollisuusalueen ominaisuuksia"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr "Rata-alue"
@@ -24777,15 +25611,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr "Muokkaa rata-alueen ominaisuuksia"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "Sotilasvoimat"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr "Muokkaa sotilasvoimien maa-alueen ominaisuuksia"
@@ -24793,50 +25627,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "Rakennustyömaa"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "Muokkaa rakennustyömaan ominaisuuksia"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr "Purettuja rakennuksia"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr "Muokkaa purettujen rakennusten alueen ominaisuuksia"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr "Rakentamiselle raivattu alue"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr "Muokkaa rakentamiselle raivatun alueen ominaisuuksia"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr "Kaatopaikka"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr "Muokkaa kaatopaikan ominaisuuksia"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "Louhos"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "Muokkaa louhoksen ominaisuuksia"
@@ -24846,5 +25680,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr ""
@@ -24853,10 +25687,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr ""
@@ -24864,5 +25698,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr ""
@@ -24871,5 +25705,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -24877,34 +25711,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr "Kielto"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr ""
@@ -24913,15 +25747,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr ""
@@ -24929,5 +25763,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr ""
@@ -24936,5 +25770,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr ""
@@ -24942,5 +25776,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr ""
@@ -25031,5 +25865,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -25039,17 +25873,17 @@
 msgstr "polkupyörä"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr ""
@@ -25109,5 +25943,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -25116,9 +25950,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr ""
@@ -25132,10 +25966,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr ""
@@ -25143,31 +25977,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr ""
@@ -25176,106 +26010,31 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 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 ""
 
@@ -25811,77 +26570,4 @@
 #: build/trans_style.java:975 build/trans_style.java:983
 msgid "highway_track"
-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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
 msgstr ""
 
@@ -26270,7 +26956,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "Ruudukko"
+msgstr ""
 
 #. color manmade
@@ -29409,4 +30094,371 @@
 msgstr "Sicily - Italy"
 
+#~ msgid "Unknown version"
+#~ msgstr "Tuntematon versio"
+
+#~ msgid "Preparing..."
+#~ msgstr "Valmistellaan..."
+
+#~ msgid "Uploading..."
+#~ msgstr "Lähetetään..."
+
+#~ msgid "Incorrect password or username."
+#~ msgstr "Virheellinen salasana tai käyttäjänimi."
+
+#~ msgid "Enter Password"
+#~ msgstr "Anna salasana"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Tallentamattomia muutoksia"
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Lisää valitut objektit jäseniksi"
+
+#~ msgid "Revert"
+#~ msgstr "Palauta"
+
+#~ msgid "Date"
+#~ msgstr "Päivämäärä"
+
+#~ msgid "Object"
+#~ msgstr "Objekti"
+
+#~ msgid "name"
+#~ msgstr "nimi"
+
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "kuva"
+#~ msgstr[1] "kuvat"
+
+#~ msgid "Image"
+#~ msgstr "Kuva"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)."
+
+#~ msgid "Update"
+#~ msgstr "Päivitä"
+
+#~ msgid "Proxy server host"
+#~ msgstr "Välityspalvelimen osoite"
+
+#~ msgid "Anonymous"
+#~ msgstr "Anonyymi"
+
+#~ msgid "Proxy server username"
+#~ msgstr "Välityspalvelimen käyttäjänimi"
+
+#~ msgid "Proxy server port"
+#~ msgstr "Välityspalvelimen portti"
+
+#~ msgid "Proxy server password"
+#~ msgstr "Välityspalvelimen salasana"
+
+#~ msgid "File not found"
+#~ msgstr "Tiedostoa ei löytynyt"
+
+#~ msgid "Open in Browser"
+#~ msgstr "Avaa selaimessa"
+
+#~ msgid "Email"
+#~ msgstr "Sähköpostiosoite"
+
+#~ msgid "Downloading..."
+#~ msgstr "Ladataan..."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Tuntematon tiedostopääte."
+
+#~ msgid "Do not show again"
+#~ msgstr "Älä näytä uudelleen"
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Virhe palvelimen vastauksen käsittelyssä."
+
+#~ msgid "Merging conflicts."
+#~ msgstr "Yhdistämisristiriidat"
+
+#~ msgid "No time for point {0} x {1}"
+#~ msgstr "Ei aikaleimaa pisteelle {0} x {1}"
+
+#~ msgid "No images with readable timestamps found."
+#~ msgstr "Ei löytynyt aikaleimallisia kuvia."
+
+#~ msgid "Read GPX..."
+#~ msgstr "Lue GPX..."
+
+#~ msgid "GPS unit timezone (difference to photo)"
+#~ msgstr "GPS-yksikön aikavyöhyke (ero kuvaan)"
+
+#~ msgid "Sync clock"
+#~ msgstr "Tahdista kello"
+
+#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+#~ msgstr "Syötä näytetty päivämäärä (kk/pp/vvvv TT:MM:SS)"
+
+#~ msgid "There is no EXIF time within the file \"{0}\"."
+#~ msgstr "Tiedostossa \"{0}\" ei ole EXIF-aikaleimaa."
+
+#~ msgid "Enable proxy server"
+#~ msgstr "Käytä välityspalvelinta"
+
+#~ msgid "Set the language."
+#~ msgstr "Aseta kieli."
+
+#~ msgid "my version:"
+#~ msgstr "minun versioni:"
+
+#~ msgid "their version:"
+#~ msgstr "palvelimen versio:"
+
+#~ msgid "Change"
+#~ msgstr "Muokkaa"
+
+#~ msgid "Move"
+#~ msgstr "Siirrä"
+
+#~ msgid "position"
+#~ msgstr "sijainti"
+
+#~ msgid "false"
+#~ msgstr "epätosi"
+
+#~ msgid "true"
+#~ msgstr "tosi"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Ristiriidassa oleva relaatio"
+
+#~ msgid "different"
+#~ msgstr "eri"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Virhe ladattaessa sivua {0}"
+
+#~ msgid "unnamed"
+#~ msgstr "nimetön"
+
+#~ msgid "Load Selection"
+#~ msgstr "Lataa valinta"
+
+#~ msgid "Data Layer"
+#~ msgstr "Datataso"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Anna haettava merkkijono"
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Tuo TCX-tiedosto GPS-jälkenä"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Tuo TCX-tiedosto..."
+
+#~ msgid "zoom"
+#~ msgstr "zoom"
+
+#~ msgid "All images"
+#~ msgstr "Kaikki kuvat"
+
+#~ msgid "help"
+#~ msgstr "ohje"
+
+#~ msgid "Only two nodes allowed"
+#~ msgstr "Vain kaksi pistettä sallittu"
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "Valituilla pisteillä on eriävät relaatiojäsenyydet. Haluatko silti "
+#~ "yhdistää ne?"
+
+#~ msgid "Only one node selected"
+#~ msgstr "Vain yksi piste valittuna"
+
+#~ msgid "Split way segment"
+#~ msgstr "Katkaise polku"
+
+#~ msgid ""
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
+#~ msgstr ""
+#~ "Valituilla poluilla on eriävät relaatiojäsenyydet. Haluatko silti "
+#~ "yhdistää ne?"
+
+#~ msgid "All the ways were empty"
+#~ msgstr "Kaikki polut olivat tyhjiä"
+
+#~ msgid "Some of the nodes are (almost) in the line"
+#~ msgstr "Jotkin pisteet ovat (melkein) viivalla"
+
+#~ msgid "The date in file \"{0}\" could not be parsed."
+#~ msgstr "Päivämäärää tiedostosta \"{0}\" ei voitu tulkita."
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "<nd>-elementti muussa kuin polussa."
+
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Voit käyttää hiirtä tai Ctrl+nuolinäppäimet lähentääksesi/loitontaaksesi "
+#~ "ja siirtääksesi näkymää."
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Napsauta ”Päivitä” päivittääksesi listan."
+
+#~ msgid "Error during parse."
+#~ msgstr "Virhe jäsennettäessä."
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Siirto keskeytettiin virheen takia (odotetaan viisi sekuntia):"
+
+#~ msgid "Plugin not found: {0}."
+#~ msgstr "Liitännäistä ei löytynyt: {0}."
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(Voit vaihtaa päivien määrän, jonka jälkeen tämä varoitus tulee,"
+#~ "<br>asettamalla ”plginmanager.warntime”-asetuksen)"
+
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "Liitännäinen vaatii JOSM:n päivityksen: {0}."
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Palvelin palautti sisäisen virheen. Kokeile ladata pienempi alue tai "
+#~ "yritä myöhemmin uudestaan."
+
+#~ msgid "Include your steps to get to the error (as detailed as possible)!"
+#~ msgstr ""
+#~ "Kerro (mahdollisimman tarkasti) mitä teit eli mitkä toimet johtivat "
+#~ "virhetilanteeseen."
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Käytä esivalintaa ”{0}”"
+
+#~ msgid "Edit Properties"
+#~ msgstr "Muokkaa ominaisuuksia"
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "Tuonnin aikana oli ristiriitoja."
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Palauta kaikkien valittujen objektien tila historialistassa valittuun "
+#~ "versioon."
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Palvelimeen ei voida yhdistää."
+
+#~ msgid "Refresh the selection list."
+#~ msgstr "Päivitä valintalista."
+
+#~ msgid "Delete the selected layer."
+#~ msgstr "Poista valittu taso."
+
+#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
+#~ msgstr "Aikaleimaa \"{0}\" ei voitu lukea pisteestä {1} x {2}"
+
+#~ msgid "timezone difference: "
+#~ msgstr "aikavyöhyke-ero: "
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "OSM-tilin salasana. Jätä tyhjäksi, jos et halua tallentaa salasanaa."
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Tagien esivalintojen lähteet"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Tagien esiasetusten lähde"
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr "Lisää uusi tagien esivalintalähde listaan."
+
+#~ msgid "Download missing plugins"
+#~ msgstr "Lataa puuttuvat liitännäiset"
+
+#~ msgid "Plugin already exists"
+#~ msgstr "Liitännäinen on jo olemassa"
+
+#~ msgid "Add either site-josm.xml or Wiki Pages."
+#~ msgstr "Lisää joko site-josm.xml tai Wiki-sivusto."
+
+#~ msgid "All installed plugins are up to date."
+#~ msgstr "Kaikki asennetut liitännäiset ovat ajantasalla."
+
+#~ msgid ""
+#~ "Activating the updated plugins failed. Check if JOSM has the permission "
+#~ "to overwrite the existing ones."
+#~ msgstr ""
+#~ "Päivitettyjen liitännäisten aktivointi epäonnistui. Tarkista, että JOSM:"
+#~ "lla on oikeus korvata vanhat tiedostot."
+
+#~ msgid "Open file (as raw gps, if .gpx)"
+#~ msgstr "Avaa tiedosto (gps-datana, jos *.gpx)"
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Liitännäistä ei voitu ladata: {0} kohteesta {1}"
+
+#~ msgid ""
+#~ "There were problems with the following plugins:\n"
+#~ "\n"
+#~ " {0}"
+#~ msgstr ""
+#~ "Seuraavissa litännäisissä oli ongelmia:\n"
+#~ "\n"
+#~ "{0}"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Virhe jäsennettäessä"
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Voi muokata ainoastaan sivuja JOSM-verkko-ohjeesta"
+
+#~ msgid "JOSM Online Help"
+#~ msgstr "JOSM-verkko-ohje"
+
+#~ msgid "Combine ways with different memberships?"
+#~ msgstr "Yhdistetäänkö polut, joilla on eriävät jäsenyydet?"
+
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr "Liitännäistä ei voitu poistaa. Tee ongelmasta virheilmoitus."
+
+#~ msgid "Be sure to include the following information:"
+#~ msgstr "Varmista, että ilmoituksesa on ainakin seuraavat tiedot:"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Yhdistetäänkö pisteet, joilla on eriävät relaatiojäsenyydet?"
+
+#~ msgid "No data imported."
+#~ msgstr "Dataa ei tuotu."
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "Merkataanko tämä ongelma todella \"valmiiksi\"?"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Palvelimelta saatuja paikanhakutuloksia ei voida lukea"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Tarkista joko nykyinen valitna tai koko data."
+
+#~ msgid "Boat"
+#~ msgstr "Vene"
+
+#~ msgid "Motorboat"
+#~ msgstr "Moottorivene"
+
 #~ msgid "Bridleway"
 #~ msgstr "Ratsastustie"
@@ -29418,15 +30470,36 @@
 #~ msgstr "Jalankulkutie"
 
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "ld > 0 vaadittu, saatiin {0}"
-
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "Parametr ''{0}'' ei saa olla \"null\""
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parametri ''{0}'' ei saa olla tyhjä"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "Odotettiin OsmDataLayer- tai GpxLayer-instanssia. Saatiin \"{0}\"."
+#~ msgid "Drawbridge"
+#~ msgstr "Laskusilta"
+
+#~ msgid "Shop"
+#~ msgstr "Kauppa"
+
+#~ msgid "map"
+#~ msgstr "kartta"
+
+#~ msgid "bicyclemap"
+#~ msgstr "pyöräkartta"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} objektilla on ristiriita:"
+#~ msgstr[1] "{0} objektilla on ristiriitoja:"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Käytä esivalintaa \"{0}\" ryhmästä \"{1}\""
+
+#~ msgid ""
+#~ "Try updating to the newest version of JOSM and all plugins before "
+#~ "reporting a bug."
+#~ msgstr ""
+#~ "Päivitä JOSM ja liitännäiset uusimpiin versioihin ennen virheilmoituksen "
+#~ "kirjoittamista."
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "<member>-tagi muussa kuin relaatiossa."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Vääränlainen pisteen id"
 
 #~ msgid ""
@@ -29439,418 +30512,4 @@
 #~ "poistamiseen.\n"
 #~ "Oletko varma, että haluat jatkaa?"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Open"
-#~ msgstr "Avoin"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Closed"
-#~ msgstr "Suljettu"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "kuva"
-#~ msgstr[1] "kuvat"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "Liitännäinen {0} tarvitsee vähintään version {1} JOSM:sta"
-
-#~ msgid "Unknown version"
-#~ msgstr "Tuntematon versio"
-
-#~ msgid "Preparing..."
-#~ msgstr "Valmistellaan..."
-
-#~ msgid "Uploading..."
-#~ msgstr "Lähetetään..."
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Virheellinen salasana tai käyttäjänimi."
-
-#~ msgid "Enter Password"
-#~ msgstr "Anna salasana"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Tallentamattomia muutoksia"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Lisää valitut objektit jäseniksi"
-
-#~ msgid "Revert"
-#~ msgstr "Palauta"
-
-#~ msgid "Date"
-#~ msgstr "Päivämäärä"
-
-#~ msgid "Object"
-#~ msgstr "Objekti"
-
-#~ msgid "name"
-#~ msgstr "nimi"
-
-#~ msgid "Image"
-#~ msgstr "Kuva"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "OSM-tilin kirjautumisnimi (sähköpostiosoite)."
-
-#~ msgid "Update"
-#~ msgstr "Päivitä"
-
-#~ msgid "Proxy server host"
-#~ msgstr "Välityspalvelimen osoite"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anonyymi"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Välityspalvelimen käyttäjänimi"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Välityspalvelimen portti"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Välityspalvelimen salasana"
-
-#~ msgid "File not found"
-#~ msgstr "Tiedostoa ei löytynyt"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Avaa selaimessa"
-
-#~ msgid "Email"
-#~ msgstr "Sähköpostiosoite"
-
-#~ msgid "Downloading..."
-#~ msgstr "Ladataan..."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Tuntematon tiedostopääte."
-
-#~ msgid "Do not show again"
-#~ msgstr "Älä näytä uudelleen"
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Virhe palvelimen vastauksen käsittelyssä."
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Yhdistämisristiriidat"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Ei aikaleimaa pisteelle {0} x {1}"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Ei löytynyt aikaleimallisia kuvia."
-
-#~ msgid "Read GPX..."
-#~ msgstr "Lue GPX..."
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "GPS-yksikön aikavyöhyke (ero kuvaan)"
-
-#~ msgid "Sync clock"
-#~ msgstr "Tahdista kello"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Syötettyä aikaa ei voitu tulkita oikein."
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Syötä näytetty päivämäärä (kk/pp/vvvv TT:MM:SS)"
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "Tiedostossa \"{0}\" ei ole EXIF-aikaleimaa."
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Käytä välityspalvelinta"
-
-#~ msgid "Set the language."
-#~ msgstr "Aseta kieli."
-
-#~ msgid "my version:"
-#~ msgstr "minun versioni:"
-
-#~ msgid "their version:"
-#~ msgstr "palvelimen versio:"
-
-#~ msgid "Change"
-#~ msgstr "Muokkaa"
-
-#~ msgid "Move"
-#~ msgstr "Siirrä"
-
-#~ msgid "position"
-#~ msgstr "sijainti"
-
-#~ msgid "false"
-#~ msgstr "epätosi"
-
-#~ msgid "true"
-#~ msgstr "tosi"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Ristiriidassa oleva relaatio"
-
-#~ msgid "different"
-#~ msgstr "eri"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Virhe ladattaessa sivua {0}"
-
-#~ msgid "unnamed"
-#~ msgstr "nimetön"
-
-#~ msgid "Load Selection"
-#~ msgstr "Lataa valinta"
-
-#~ msgid "Data Layer"
-#~ msgstr "Datataso"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Anna haettava merkkijono"
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Tuo TCX-tiedosto GPS-jälkenä"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Tuo TCX-tiedosto..."
-
-#~ msgid "zoom"
-#~ msgstr "zoom"
-
-#~ msgid "All images"
-#~ msgstr "Kaikki kuvat"
-
-#~ msgid "help"
-#~ msgstr "ohje"
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Vain kaksi pistettä sallittu"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "Valituilla pisteillä on eriävät relaatiojäsenyydet. Haluatko silti "
-#~ "yhdistää ne?"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Vain yksi piste valittuna"
-
-#~ msgid "Split way segment"
-#~ msgstr "Katkaise polku"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "Valituilla poluilla on eriävät relaatiojäsenyydet. Haluatko silti "
-#~ "yhdistää ne?"
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Kaikki polut olivat tyhjiä"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Jotkin pisteet ovat (melkein) viivalla"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "Päivämäärää tiedostosta \"{0}\" ei voitu tulkita."
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "<nd>-elementti muussa kuin polussa."
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr ""
-#~ "Voit käyttää hiirtä tai Ctrl+nuolinäppäimet lähentääksesi/loitontaaksesi "
-#~ "ja siirtääksesi näkymää."
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Napsauta ”Päivitä” päivittääksesi listan."
-
-#~ msgid "Error during parse."
-#~ msgstr "Virhe jäsennettäessä."
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Siirto keskeytettiin virheen takia (odotetaan viisi sekuntia):"
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Liitännäistä ei löytynyt: {0}."
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(Voit vaihtaa päivien määrän, jonka jälkeen tämä varoitus tulee,"
-#~ "<br>asettamalla ”plginmanager.warntime”-asetuksen)"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Liitännäinen vaatii JOSM:n päivityksen: {0}."
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Palvelin palautti sisäisen virheen. Kokeile ladata pienempi alue tai "
-#~ "yritä myöhemmin uudestaan."
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr ""
-#~ "Kerro (mahdollisimman tarkasti) mitä teit eli mitkä toimet johtivat "
-#~ "virhetilanteeseen."
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Käytä esivalintaa ”{0}”"
-
-#~ msgid "Edit Properties"
-#~ msgstr "Muokkaa ominaisuuksia"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Tuonnin aikana oli ristiriitoja."
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Palauta kaikkien valittujen objektien tila historialistassa valittuun "
-#~ "versioon."
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Palvelimeen ei voida yhdistää."
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Päivitä valintalista."
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Poista valittu taso."
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Aikaleimaa \"{0}\" ei voitu lukea pisteestä {1} x {2}"
-
-#~ msgid "timezone difference: "
-#~ msgstr "aikavyöhyke-ero: "
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr ""
-#~ "OSM-tilin salasana. Jätä tyhjäksi, jos et halua tallentaa salasanaa."
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Tagien esivalintojen lähteet"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Tagien esiasetusten lähde"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "Lisää uusi tagien esivalintalähde listaan."
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Lataa puuttuvat liitännäiset"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Liitännäinen on jo olemassa"
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Lisää joko site-josm.xml tai Wiki-sivusto."
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Kaikki asennetut liitännäiset ovat ajantasalla."
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Päivitettyjen liitännäisten aktivointi epäonnistui. Tarkista, että JOSM:"
-#~ "lla on oikeus korvata vanhat tiedostot."
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Avaa tiedosto (gps-datana, jos *.gpx)"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Liitännäistä ei voitu ladata: {0} kohteesta {1}"
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Seuraavissa litännäisissä oli ongelmia:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Virhe jäsennettäessä"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Voi muokata ainoastaan sivuja JOSM-verkko-ohjeesta"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "JOSM-verkko-ohje"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Yhdistetäänkö polut, joilla on eriävät jäsenyydet?"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr "Liitännäistä ei voitu poistaa. Tee ongelmasta virheilmoitus."
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Varmista, että ilmoituksesa on ainakin seuraavat tiedot:"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Valitse polkuja, joiden segmenttien välillä on melkein suora kulma."
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Yhdistetäänkö pisteet, joilla on eriävät relaatiojäsenyydet?"
-
-#~ msgid "No data imported."
-#~ msgstr "Dataa ei tuotu."
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "Merkataanko tämä ongelma todella \"valmiiksi\"?"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Palvelimelta saatuja paikanhakutuloksia ei voida lukea"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Tarkista joko nykyinen valitna tai koko data."
-
-#~ msgid "Drawbridge"
-#~ msgstr "Laskusilta"
-
-#~ msgid "Station"
-#~ msgstr "Asema"
-
-#~ msgid "Shop"
-#~ msgstr "Kauppa"
-
-#~ msgid "map"
-#~ msgstr "kartta"
-
-#~ msgid "bicyclemap"
-#~ msgstr "pyöräkartta"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} objektilla on ristiriita:"
-#~ msgstr[1] "{0} objektilla on ristiriitoja:"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Käytä esivalintaa \"{0}\" ryhmästä \"{1}\""
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr ""
-#~ "Päivitä JOSM ja liitännäiset uusimpiin versioihin ennen virheilmoituksen "
-#~ "kirjoittamista."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "<member>-tagi muussa kuin relaatiossa."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Vääränlainen pisteen id"
 
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
@@ -30005,7 +30664,4 @@
 #~ "lähetetyillä elementeillä on historia."
 
-#~ msgid "Public"
-#~ msgstr "Julkinen"
-
 #~ msgid ""
 #~ "This action will require {0} individual download requests. Do you wish to "
@@ -30069,4 +30725,7 @@
 #~ msgstr "GPX-jälki ladattu"
 
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "parametri ''{0}'' ei saa olla tyhjä"
+
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Ei voitu lukea \"{0}\":aa"
@@ -30078,7 +30737,19 @@
 #~ msgstr "Päivittää valitut objektit palvelimelta"
 
+#~ msgid "Plugin {0} requires JOSM update to version {1}."
+#~ msgstr "Liitännäinen {0} tarvitsee vähintään version {1} JOSM:sta"
+
 #~ msgid "Plug-in named {0} is not available. Update skipped."
 #~ msgstr "Liitännäinen {0} ei ole saatavilla."
 
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "Parametr ''{0}'' ei saa olla \"null\""
+
+#~ msgid "Id > 0 required, got {0}"
+#~ msgstr "ld > 0 vaadittu, saatiin {0}"
+
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr "Odotettiin OsmDataLayer- tai GpxLayer-instanssia. Saatiin \"{0}\"."
+
 #~ msgid "Updating primitive"
 #~ msgstr "Päivitä objekti"
@@ -30086,2 +30757,10 @@
 #~ msgid "Always move and don't show dialog again"
 #~ msgstr "Siirrä aina, äläkä näytä tätä kysymystä enää"
+
+#~ msgctxt "changeset.open"
+#~ msgid "Closed"
+#~ msgstr "Suljettu"
+
+#~ msgctxt "changeset.open"
+#~ msgid "Open"
+#~ msgstr "Avoin"
Index: applications/editors/josm/i18n/po/fr.po
===================================================================
--- applications/editors/josm/i18n/po/fr.po	(revision 19689)
+++ applications/editors/josm/i18n/po/fr.po	(revision 19698)
@@ -6,7 +6,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-19 00:01-0500\n"
-"PO-Revision-Date: 2010-01-17 02:51-0500\n"
-"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-24 23:42+0000\n"
+"Last-Translator: jojolebestof <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-01-13 18:25+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: French\n"
@@ -69,11 +69,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -94,4 +94,5 @@
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
+"Le paramètre \"downloadgps\" n'accepte pas de noms de fichier ou des URLs."
 
 #: ../core/src/org/openstreetmap/josm/Main.java:497
@@ -243,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -255,13 +256,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -270,5 +271,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -295,5 +299,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Fusionner"
@@ -324,5 +328,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -389,9 +393,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -399,5 +403,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "OK"
@@ -448,6 +454,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -465,5 +471,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -472,11 +478,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -513,5 +519,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "le conflit"
@@ -523,9 +529,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37
 msgid "previous"
-msgstr ""
+msgstr "précédent"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38
 msgid "next"
-msgstr ""
+msgstr "suivant"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
@@ -559,5 +565,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:32
 msgid "Changeset Manager"
-msgstr "Gestionnaire d’ensemble de changement"
+msgstr "Gestionnaire de lots de changements"
 
 #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:34
@@ -569,10 +575,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:394
 msgid "Close open changesets"
-msgstr "Fermer les ensembles de changements"
+msgstr "Fermer les lots de changements"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:36
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39
 msgid "Closes open changesets"
-msgstr "Ferme les ensembles de changements"
+msgstr "Ferme les lots de changements"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:39
@@ -592,15 +598,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:81
 msgid "There are no open changesets"
-msgstr "Il n’y a pas d’ensembles de changements ouverts"
+msgstr "Il n'y a pas de lot de changements ouverts"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:82
 msgid "No open changesets"
-msgstr "Pas d’ensembles de changements ouverts"
+msgstr "Aucun lot de changements ouvert"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44
 msgid "Downloading open changesets ..."
-msgstr "Téléchargement des ensembles de changements ouverts…"
+msgstr "Téléchargement des lots de changements ouverts..."
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
@@ -646,14 +652,14 @@
 msgstr "Veuillez sélectionner au moins deux voies à fusionner."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Copier"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Copier les objets sélectionnés dans la mémoire tampon."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Veuillez sélectionner quelque chose à copier."
@@ -686,8 +692,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -696,5 +702,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -753,15 +759,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Il y a eu {0} conflits durant l’import."
-msgstr[1] "Il y a eu {0} conflits durant l’import."
+msgstr[0] "Il y avait (0) conflit durant l'importation."
+msgstr[1] "Il y avait (0) conflits durant l'importation."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "Conflits durant le téléchargement"
+msgstr[0] "Conflit durant le téléchargement"
 msgstr[1] "Conflits durant le téléchargement"
 
@@ -783,4 +788,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -790,4 +797,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Dupliquer la sélection par un copier-coller immédiat."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Chemin dupliqué"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "éditer la relation sélectionnée"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "Couche : {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "Zoom sur {0}"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr ""
 
 #. <button label="Info" hotkey="I">
@@ -879,10 +914,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 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] "La voie sélectionnée ne contient pas le nœud sélectionné."
-msgstr[1] "La voie sélectionnée ne contient pas tous les nœuds sélectionnés."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -894,5 +928,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:69
 msgid "Are you really sure to continue?"
-msgstr ""
+msgstr "Êtes-vous vraiment sûr de vouloir continuer?"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157
@@ -1004,5 +1038,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "URL"
@@ -1156,5 +1190,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+#, fuzzy
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr ""
 "<html>Impossible d’ouvrir un dossier.<br>Veuillez sélectionner un fichier !"
@@ -1169,9 +1204,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Ouverture de {0} fichiers…"
-msgstr[1] "Ouverture de {0} fichiers…"
+msgstr[0] "Ouverture du fichier {0} ..."
+msgstr[1] "Ouverture des fichiers {0} ..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1228,7 +1263,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1242,5 +1277,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "Déplacer les nœuds pour que tous les angles soient à 90 ou 270°"
 
@@ -1283,4 +1319,9 @@
 "vous continuer ?</html>"
 
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+#, fuzzy
+msgid "Selection must consist only of ways and nodes."
+msgstr "Les Multipolygones doivent contenir seulement des chemin fermés."
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
 msgid "Orthogonalize"
@@ -1295,4 +1336,17 @@
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "Les éléments sélectionnés ne peuvent être mis en forme orthogonale"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr ""
+"Veuillez sélectionner des chemins avec des angles droits afin de les "
+"orthogonaliser."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1309,5 +1363,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151
 msgid "Delete incomplete members?"
-msgstr ""
+msgstr "Supprimer les membres incomplets ?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152
@@ -1353,5 +1407,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Open a preferences dialog for global settings."
-msgstr ""
+msgstr "Ouvre une boite de dialogue pour les réglages de préférences."
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
@@ -1400,18 +1454,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1436,12 +1490,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Erreur"
@@ -1577,5 +1632,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1785,9 +1840,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "Dupliquer {0} nœuds en {1} nœuds"
-msgstr[1] "Dupliquer {0} nœuds en {1} nœuds"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1832,5 +1887,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr "Télécharger les données."
@@ -1839,5 +1894,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:27
 msgid "Update modified"
-msgstr ""
+msgstr "Mise à jour modifiée"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:25
@@ -2274,6 +2329,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2359,7 +2414,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
-#, fuzzy
 msgid "<not>"
-msgstr "Nord"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
@@ -2372,7 +2426,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
-#, fuzzy
 msgid "<right parent>"
-msgstr "Il manque la parenthèse droite"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
@@ -2402,5 +2455,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Rechercher des objets."
@@ -2598,5 +2651,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Chercher"
@@ -2637,25 +2690,22 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "CS"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
-msgstr "CI"
+msgstr ""
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
-msgstr "RX"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2669,5 +2719,5 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2675,5 +2725,5 @@
 "d’utilisation : clé=valeur"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2697,7 +2747,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
-msgstr "Jeton inattendu : {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
@@ -2816,9 +2866,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "{0} objets ajoutés"
-msgstr[1] "{0} objets ajoutés"
+msgstr[0] "Objet ajouté {0}"
+msgstr[1] "Objets ajoutés {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2868,12 +2918,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "Enlever \"{0}\" pour {1} {2}"
+msgstr "Supprimer \"{0}\" pour les objets {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Mettre {0}={1} pour {2} {3}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2933,17 +2983,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Mode Suppression"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Supprimer {0} chemin"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Supprimer {0} relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -3024,9 +3074,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "Objets ''{0}'' purgés"
-msgstr[1] "Objets ''{0}'' purgés"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -3076,24 +3126,24 @@
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "Undelete {0} primitive"
 msgid_plural "Undelete {0} primitives"
-msgstr[0] "Restaurer {0} primitives"
-msgstr[1] "Restaurer {0} primitives"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for node {0}"
-msgstr "Résoudre les conflits de version pour le nœud {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for way {0}"
-msgstr "Résoudre les conflits de version pour le chemin {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Résoudre les conflits de version pour la relation {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3195,11 +3245,9 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
 "not a directory."
 msgstr ""
-"échec de la définition de la référence. la référence de version {0} n’est "
-"pas disponible dans l’historique"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
@@ -3352,5 +3400,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3358,5 +3406,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3364,5 +3412,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3370,5 +3418,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3435,8 +3483,7 @@
 #. column header: hide filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
-#, fuzzy
 msgctxt "filter"
 msgid "H"
-msgstr "H"
+msgstr ""
 
 #. column header: filter text
@@ -3448,67 +3495,60 @@
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "C"
+msgstr ""
 
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
-#, fuzzy
 msgctxt "filter"
 msgid "I"
-msgstr "I"
+msgstr ""
 
 #. column header: filter mode
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
-#, fuzzy
 msgctxt "filter"
 msgid "M"
-msgstr "M"
+msgstr ""
 
 #. translators notes must be in front
 #. filter mode: replace
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210
-#, fuzzy
 msgctxt "filter"
 msgid "R"
-msgstr "R"
+msgstr ""
 
 #. filter mode: add
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211
-#, fuzzy
 msgctxt "filter"
 msgid "A"
-msgstr "A"
+msgstr ""
 
 #. filter mode: remove
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212
-#, fuzzy
 msgctxt "filter"
 msgid "D"
-msgstr "D"
+msgstr ""
 
 #. filter mode: in selection
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213
-#, fuzzy
 msgctxt "filter"
 msgid "F"
-msgstr "F"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Une primitive avec un ID égal à 0 ne peut pas être invisible."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3517,5 +3557,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3523,5 +3563,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3647,6 +3687,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3656,5 +3696,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3665,7 +3705,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3687,5 +3727,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "arrière-plan"
@@ -3829,6 +3869,6 @@
 msgstr "Ne plus afficher (choix mémorisé)"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3836,37 +3876,38 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "incomplet"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "highway"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "voie ferrée"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "voie navigable"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "utilisation du terrain"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3875,10 +3916,10 @@
 msgstr[1] "{0} nœuds"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3887,5 +3928,5 @@
 msgstr[1] "{0} membres"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3922,6 +3963,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Conflit"
@@ -3932,7 +3973,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-#, fuzzy
-msgid "Authorization Failed"
-msgstr "La connexion a échoué."
+msgid "Authorisation Failed"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
@@ -4137,5 +4177,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Initialisation"
@@ -4176,5 +4215,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4185,5 +4224,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Édition"
@@ -4254,29 +4293,29 @@
 msgstr "échelle"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "La longitude géographique au niveau du pointeur de souris."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The name of the object at the mouse pointer."
 msgstr "Le nom de l’objet au niveau du pointeur de souris."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "La latitude géographique au niveau du pointeur de souris."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The angle between the previous and the current way segment."
 msgstr "L’angle entre le segment de chemin précédent et l’actuel."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "L’orientation (boussole) du segment en train d’être dessiné."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 msgid "The length of the new way segment being drawn."
 msgstr "La longueur du nouveau segment du chemin étant actuellement dessiné."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4284,9 +4323,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(aucun objet)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4453,16 +4492,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Étiquettes ({0} conflits)"
-msgstr[1] "Étiquettes ({0} conflits)"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "{0} pending tag conflict to be resolved"
 msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} conflit(s) d’attribut à résoudre"
-msgstr[1] "{0} conflit(s) d’attribut à résoudre"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
@@ -4521,16 +4560,16 @@
 msgstr "Résolution de conflits"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr "la liste du rôle {0} ne participe pas à une comparaison de paire"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "valeur du paramètre \"index\" inattendue. Reçu {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4745,9 +4784,14 @@
 msgstr "Nœud"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 "Les nœuds fusionnés ne sont pas encore figés. Impossible de construire la "
 "commande de résolution"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4775,5 +4819,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional node used by way {1}<br>which is deleted on the "
@@ -4783,9 +4827,5 @@
 "server.<br><br>Do you want to undelete these nodes too?"
 msgstr[0] ""
-"<html>Il y a {0} nœuds additionnels faisant partie du chemin {1}<br>qui sont "
-"supprimés du serveur.<br><br>Voulez-vous les restaurer également ?</html>"
 msgstr[1] ""
-"<html>Il y a {0} nœuds additionnels faisant partie du chemin {1}<br>qui sont "
-"supprimés du serveur.<br><br>Voulez-vous les restaurer également ?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
@@ -4794,5 +4834,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional primitive referred to by relation {1}<br>which is "
@@ -4802,11 +4842,5 @@
 "deleted on the server.<br><br>Do you want to undelete these too?"
 msgstr[0] ""
-"<html>Il y a {0} primitives référencées dans la relation {1}<br>qui sont "
-"supprimées sur le serveur.<br><br>Voulez-vous les restaurer également ?</"
-"html>"
 msgstr[1] ""
-"<html>Il y a {0} primitives référencées dans la relation {1}<br>qui sont "
-"supprimées sur le serveur.<br><br>Voulez-vous les restaurer également ?</"
-"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
@@ -4909,5 +4943,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr "Non, annuler"
@@ -4955,5 +4989,10 @@
 msgstr "Primitive"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -5086,10 +5125,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "rien"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "all"
@@ -5169,7 +5208,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -5179,6 +5218,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5358,10 +5397,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5381,13 +5420,13 @@
 msgstr "Pile de commande : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr "Résoudre les conflits."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Résoudre"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
@@ -5395,6 +5434,6 @@
 "liste ci-dessus."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5429,5 +5468,5 @@
 "<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.Click <strong>{0}</strong> to close anyway."
+"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.</"
@@ -5453,5 +5492,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5460,5 +5499,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5538,43 +5577,48 @@
 msgstr "Afficher l’historique de l’élément sélectionné."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Calques"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 msgid "Open a list of all loaded layers."
 msgstr "Ouvrir une liste de tous les calques chargés."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Montrer/Cacher"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:347
 msgid "Toggle visible state of the selected layer."
 msgstr "Bascule l’état de visibilité du calque sélectionné."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr "Activer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr "Active la couche sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr "Fusionne cette couche dans une autre"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Chemin dupliqué"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 msgid "Move the selected layer one row up."
 msgstr "Déplacer le calque sélectionné un niveau vers le haut."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Déplacer le calque sélectionné un niveau vers le bas."
@@ -5588,6 +5632,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Relations"
@@ -5597,22 +5641,22 @@
 msgstr "Ouvrir une liste de toutes les relations."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relations : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Ouvrir un éditeur pour la relation sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Supprimer la relation sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Créer une nouvelle relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
@@ -5621,47 +5665,47 @@
 "d’édition"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Sélection actuelle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Ouvrir une fenêtre de liste de sélection."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Zoomer sur le(s) élément(s) sélectionné(s)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Zoomer sur la sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sél.: Rel.:{0}/Chemins:{1}/Nœuds:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5669,5 +5713,5 @@
 msgstr "Sélection"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -6021,8 +6065,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -6094,4 +6136,7 @@
 #. <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 />
@@ -6170,6 +6215,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6211,6 +6257,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6679,152 +6727,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Nom"
@@ -7207,5 +7257,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<différent>"
@@ -7261,55 +7311,55 @@
 msgstr "Ajouter des Propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propriétés : {0} / Appartenances : {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Propriétés / Appartenances"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Changer la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "Supprimer de la relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Supprimer vraiment la sélection de la relation {0} ?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Supprimer la clé sélectionnée de tous les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "Supprimer les propriétés"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Ajouter une nouvelle paire clé/valeur à tous les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Éditer la valeur de la clé selectionnée pour tous les objets"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7345,9 +7395,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1093
-#, fuzzy
 msgid "Conflict in data"
 msgid_plural "Conflicts in data"
-msgstr[0] "Conflit dans les données."
-msgstr[1] "Conflit dans les données."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:345
@@ -7648,7 +7697,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
-#, fuzzy
 msgid "Do you really want to apply the new role?"
-msgstr "Voulez-vous vraiment effacer la couche''{0}''?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
@@ -7744,9 +7792,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr ""
-"Attention : exception ignorée car la tâche est annulée. Exception : {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
@@ -7765,27 +7812,28 @@
 msgid "way is not connected to previous or next relation member"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+"Le chemin n'est pas connecté au précédent membre de la relation ni au suivant"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Marque-pages"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+#, fuzzy
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
 msgstr ""
 "<html><strong>Zone actuelle de téléchargement</strong> (minlat,minlon, "
 "maxlat, maxlon): {0}, {1}, {2}, {3}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr "Créer un marque-pages"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:185
 msgid "Add a bookmark for the currently selected download area"
 msgstr ""
@@ -7793,25 +7841,25 @@
 "sélectionnée."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187
+#: ../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:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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 ""
 "Veuillez entrer un nom pour le marque page de la zone de téléchargement."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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 "Nom du lieu"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:217
 msgid "Remove the currently selected bookmarks"
 msgstr "Supprimer le marque-pages actuellement sélectionné."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr "Renommer le marque-pages actuellement sélectionné."
@@ -7849,7 +7897,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
-#, fuzzy, java-format
+#, java-format
 msgid "The string ''{0}'' is not a valid double value."
-msgstr "le paramètre \"{0}\" n’a pas un nom valide, reçu \"{1}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
@@ -7938,18 +7986,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr "Limites"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr "Près"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -7960,35 +8008,35 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
 msgid "Enter a place name to search for:"
 msgstr "Entrez un nom d’endroit à rechercher :"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:112
 msgid "Enter a place name to search for"
 msgstr "Enter le nom d’un lieu à rechercher"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:148
 msgid "Areas around places"
 msgstr "Zone autour d’un endroit"
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr ""
 "Échec (NullPointerException). Sans doute parce qu’il manque des attributs."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr "Rechercher…"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr ""
@@ -7999,7 +8047,9 @@
 #. 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" />
@@ -8008,10 +8058,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Type"
@@ -8020,5 +8071,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -8030,17 +8081,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "inconnu"
@@ -8161,9 +8211,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511
-#, fuzzy, java-format
+#, java-format
 msgid "Warning: bad location in HTML document. Exception was: {0}"
 msgstr ""
-"Attention : la boîte de dialogue des options n’a pu être affichée au premier "
-"plan. L’exception était : {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561
@@ -8297,5 +8345,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:55
 msgid "Changeset"
-msgstr "Ensemble de changement"
+msgstr "Lot de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
@@ -8313,15 +8361,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
 msgid "Changeset info"
-msgstr "Informations sur l’ensemble de changements"
+msgstr "Informations sur le lot de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120
 msgid "Launch browser with information about the changeset"
-msgstr ""
-"Lancer un navigateur avec les informations sur l’ensemble de changements"
+msgstr "Lancer le navigateur avec les informations sur le lot de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:139
 #, java-format
 msgid "Show changeset {0}"
-msgstr "Montrer l’ensemble de changements {0}"
+msgstr "Montrer le lot de changements {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:62
@@ -8408,5 +8455,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr "Conflits détectés"
@@ -8439,5 +8486,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202
 msgid "Changeset closed"
-msgstr "Ensemble de changement fermé"
+msgstr "Lot de changements fermé"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:214
@@ -8485,5 +8532,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
 msgid "Changeset id:"
-msgstr "Identifiant de l’ensemble de changements :"
+msgstr "Identifiant du lot de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
@@ -8497,5 +8544,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
 msgid "No open changeset"
-msgstr "Aucun ensemble de changements ouvert"
+msgstr "Aucun lot de changements ouvert"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:78
@@ -8524,9 +8571,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:143
 msgid "Close changeset after upload"
-msgstr "Fermer l’ensemble de changements après l’envoi"
+msgstr "Fermer le lot de changements après envoi"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:144
 msgid "Select to close the changeset after the next upload"
-msgstr "Fermer l’ensemble de changements après le prochain envoi"
+msgstr "Fermer le lot de changements après le prochain envoi"
 
 #. putValue(NAME, tr("Reload"));
@@ -8537,5 +8584,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:315
 msgid "Close the currently selected open changeset"
-msgstr "Fermer l’ensemble de changements actuellement ouvert"
+msgstr "Fermer le lot de changements actuellement sélectionné"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55
@@ -8547,26 +8594,26 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88
 msgid "Open changesets"
-msgstr "Ouvrir les ensembles de changements"
+msgstr "Ouvrir des lots de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119
 msgid "Close changesets"
-msgstr "Fermer les ensembles de changements"
+msgstr "Fermer les lots de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121
 msgid "Close the selected open changesets"
-msgstr "Fermer les ensembles de changements sélectionnés"
+msgstr "Fermer les lots de changements sélectionnés"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:144
 msgid "Cancel closing of changesets"
-msgstr "Annuler la fermeture des ensembles de changements"
+msgstr "Annuler la fermeture des lots de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38
 msgid "Closing changeset"
-msgstr "Fermeture de l’ensemble de changements"
+msgstr "Fermeture du lot de changements"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76
 #, java-format
 msgid "Closing changeset {0}"
-msgstr "Fermeture de l’ensemble de changements {0}"
+msgstr "Fermeture du lot de changements {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99
@@ -8782,5 +8829,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>{0} layer needs saving but has an associated file<br>which cannot be "
@@ -8792,10 +8839,5 @@
 "changes.<br>Layers with non-writable files:</html>"
 msgstr[0] ""
-"<html>Le calque {0} comporte des conflits non résolus.<br>Résolvez-les ou "
-"abandonnez les modifications.<br>Calque qui comporte des conflits :</html>"
 msgstr[1] ""
-"<html>Les calques {0} comportent des conflits non résolus.<br>Résolvez-les "
-"ou abandonnez les modifications.<br>Calques qui comportent des conflits :</"
-"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
@@ -8878,9 +8920,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8890,7 +8932,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -8902,16 +8944,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "Calque"
@@ -9063,5 +9105,9 @@
 "Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong>"
 msgstr[0] ""
+"Télécharger <strong>{0} objet</strong> dans <strong>1 lot de changement</"
+"strong>"
 msgstr[1] ""
+"Télécharger <strong>{0} objets</strong> dans <strong>1 lot de changement</"
+"strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:86
@@ -9074,5 +9120,9 @@
 "<strong>1 request</strong>"
 msgstr[0] ""
+"Télécharger <strong>{0} objet</strong> dans <strong>1 lot de changement</"
+"strong> via <strong>1 requête</strong>"
 msgstr[1] ""
+"Télécharger <strong>{0} objets</strong> dans <strong>1 lot de changement</"
+"strong> via <strong>1 requête</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:91
@@ -9106,10 +9156,10 @@
 #, java-format
 msgid "Uploading data for layer ''{0}''"
-msgstr "Envoi des données pour le calque ''{0}''"
+msgstr "Téléchargement des données pour le calque \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:80
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:280
 msgid "Continue uploading"
-msgstr "Continuer à envoyer."
+msgstr "Continuer le téléchargement"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:82
@@ -9119,5 +9169,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:86
 msgid "Go back to Upload Dialog"
-msgstr ""
+msgstr "Revenir à la fenêtre d'envoi"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:88
@@ -9131,5 +9181,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94
 msgid "Click to abort uploading"
-msgstr ""
+msgstr "Cliquer pour interrompre le téléchargement"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99
@@ -9180,5 +9230,5 @@
 #, java-format
 msgid "Uploading {0} objects ..."
-msgstr "Envoi de {0} objets…"
+msgstr "Téléchargement de {0} objets..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:287
@@ -9333,68 +9383,68 @@
 msgstr[1] "{0} objets à supprimer :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "point GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Personnaliser le dessin des lignes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../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:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Personnaliser la couleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Par défaut"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Choisir une couleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr "Marqueurs depuis des points nommés"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Points de parcours nommés depuis {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Importer Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9404,23 +9454,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Fichiers audio Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marqueurs audio de {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Importer des images"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9430,5 +9480,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9436,5 +9486,5 @@
 msgstr "Nom : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9442,5 +9492,5 @@
 msgstr "Description : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9450,23 +9500,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "Description"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr "Longueur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Longueur : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9475,5 +9525,5 @@
 msgstr[1] "{0} chemins, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9482,10 +9532,10 @@
 msgstr[1] "{0} chemins"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Convertir en calque de données"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9496,43 +9546,43 @@
 "regardez ici :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Converti depuis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "Télécharger depuis OSM le long de cette trace"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Tout télécharger dans un rayon de :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} mètres"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "Aire maximale par requête:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9543,5 +9593,5 @@
 "Voulez-vous<br>continuer ?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
@@ -9549,5 +9599,5 @@
 "audio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9557,5 +9607,5 @@
 "chemin ont été omis ou déplacés au début."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9565,19 +9615,19 @@
 "estimer leur horodatage ont été omis."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Couche de données {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "en dehors de la zone téléchargée"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr "version {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
@@ -9585,5 +9635,5 @@
 "0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9592,5 +9642,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9604,5 +9654,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9615,11 +9665,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9628,32 +9678,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} est consistué de :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr "non défini"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr "Version de l’API : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Convertir en calque GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr "Pas de problème trouvé."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9703,24 +9753,24 @@
 msgstr "Point GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Fichiers GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, 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:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Erreur pendant le traitement {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Impossible de lire \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9732,34 +9782,34 @@
 "hpoto et sélectionnez un fuseau horaire.<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr "Heure de la photo (information EXIF) :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 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:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [jj/mm/aaa hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 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:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "Aucune date"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr "Ouvrez une autre photo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 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:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9769,64 +9819,64 @@
 "Merci d’utiliser le format demandé"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "Date non valide"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr "<Aucune trace GPX encore chargée>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr "Trace GPX : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr "Ouvrir une autre trace GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr "Fuseau horaire : "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr "Décallage :"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9836,45 +9886,45 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr "Correler les images avec la trace GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr "Corréler"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr "Fuseau horaire invalide"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr "Décallage invalide"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Fuseau horaire : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutes : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Secondes : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9883,5 +9933,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9892,22 +9942,22 @@
 "manuellement."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 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:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr "Ajuster le fuseau horaire et le décalage"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 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:951
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 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:979
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -9917,17 +9967,17 @@
 "autre."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 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:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 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:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr "Aucune trace GPX sélectionnée"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9938,5 +9988,5 @@
 "Format attendu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9947,75 +9997,75 @@
 "Format attendu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extractions des positions GPS depuis les informations EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr "Début du parcours du dossier"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 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:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "Lexture des images…"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Lecture de {0}…"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Impossible d’obtenir le chemin canonique du dossier {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Parcours du dossier {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, 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:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, 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:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Images géolocalisées"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr "Corréler en GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "Aucune donnée chargée"
-msgstr[1] "Aucune donnée chargée"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
+#, java-format
 msgid "{0} was found to be GPS tagged."
 msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] "{0} ont été trouvées pour être géoétiquettées."
-msgstr[1] "{0} ont été trouvées pour être géoétiquettées."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -10024,5 +10074,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10054,5 +10104,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88
 msgid "Show previous Image"
-msgstr ""
+msgstr "Afficher l'image précédente"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88
@@ -10119,5 +10169,5 @@
 msgstr "marqueur gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10125,5 +10175,5 @@
 msgstr[1] "marqueurs"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10132,9 +10182,9 @@
 msgstr[1] "{0} est constitué de {1} marqueurs"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "Synchronizer l’audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10143,20 +10193,20 @@
 "de synchronisation."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr "Fichier audio synchronisé au point {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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 actuellemnt lu."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 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:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -10166,5 +10216,5 @@
 "voulez le marqueur."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
@@ -10172,13 +10222,13 @@
 "décalage ."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Afficher/Masquer Texte/Icônes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Bascule l’état de visibilté du marqueur de texte et d’icônes."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
+#: ../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 "
@@ -10188,5 +10238,5 @@
 "laquelle vous voulez l’associer (après le premier marqueur)."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -10196,5 +10246,5 @@
 "marqueur audio ou sur le point de la trace où vous voulez synchroniser."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "Impossible de créer un nouveau marqueur audio."
@@ -10220,19 +10270,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
+#, java-format
 msgid ""
 "Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
 msgstr ""
-"Attention : la boîte de dialogue des options n’a pu être affichée au premier "
-"plan. L’exception était : {0}"
-
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
-#, fuzzy, java-format
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
+#, java-format
 msgid ""
 "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
 msgstr ""
-"Attention : la boîte de dialogue des options n’a pu être affichée au premier "
-"plan. L’exception était : {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
@@ -10280,7 +10326,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
 msgid "Authorize URL:"
-msgstr "Auteur"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10370,7 +10415,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
 msgid "Authorize now"
-msgstr "Auteur"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10429,7 +10473,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
-#, fuzzy
 msgid "OAuth authorization failed"
-msgstr "La connexion a échoué."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
@@ -10509,7 +10552,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
 msgid "Please select an authorization procedure: "
-msgstr "Veuillez sélectionner au moins quatre nœuds."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10519,7 +10561,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
-#, fuzzy
 msgid "Close the dialog and cancel authorization"
-msgstr "Fermer cette fenêtre et annuler le téléchargement"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
@@ -10573,7 +10614,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498
-#, fuzzy, java-format
+#, java-format
 msgid "Authorizing request token ''{0}''..."
-msgstr "Sauvegarde du calque vers ''{0}''…"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:504
@@ -10691,5 +10732,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:349
 msgid "Go back to step 1/3"
-msgstr ""
+msgstr "Revenir à l'étape 1/3"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:292
@@ -10793,5 +10834,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
-#, fuzzy
 msgid ""
 "<html>The test failed because the server responded with an internal error."
@@ -10799,7 +10839,4 @@
 "</html>"
 msgstr ""
-"<html>Le serveur OSM<br>''{0}''<br>a rapporté une erreur interne du serveur."
-"<br>Il s’agit probablement d’un problème temporaire. Veuillez réessayer plus "
-"tard.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
@@ -10838,5 +10875,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Veuille sélectionnez la rangée à éditer."
@@ -10850,5 +10887,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -11008,9 +11045,4 @@
 msgstr "Style de rendu {0} : {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "Couche : {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -11040,6 +11072,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr "Tous"
@@ -11080,8 +11112,8 @@
 msgstr "Une seule couleur (peut être personnalisée pour les couches nommées)"
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Voiture"
@@ -11103,13 +11135,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Vélos"
@@ -11142,12 +11174,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "Piétons"
@@ -11509,5 +11541,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
-#, fuzzy
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11523,13 +11554,4 @@
 "keyboard...</p>"
 msgstr ""
-"<p>Vous pouvez remarquer que la liste de sélection des clés sur la page "
-"suivante liste toutes les touches que Java connait sur n’importe quel type "
-"de clavier, et pas uniquement les touches de votre clavier. N’utilisez que "
-"les touches existant vraiment sur cotre clavier. Ainsi, si votre clavier n’a "
-"pas de touche 'Copy' (les claviers de PC n’en ont pas mais les claviers Sun "
-"en ont), ne l’utilisez pas. N’utilisez pas non plus une touche qui "
-"correspond à un raccourcie de votre claiver. Ne pas respecter cela pourra "
-"aboutir sur des conflits, JOS ne savant par exemple pas que Ctrl+Maj+; et "
-"Ctrl+: sont la même chose pour un clavier américain.</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
@@ -11715,5 +11737,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
 msgid "File backup"
-msgstr ""
+msgstr "Fichier de sauvegarde"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
@@ -12151,5 +12173,12 @@
 msgstr "Supprimer la sélection dans la table des attributs"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -12157,18 +12186,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "Attributs optionnels:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr "voie sans issue"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Type inconnu : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -12179,16 +12208,16 @@
 msgstr "Impossible de lire la source des balises prédéfinies : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Erreur de traitement {0} : "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Les éléments de type {0} sont avalisés."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -12197,18 +12226,17 @@
 msgstr[1] "Changer {0} objets."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "Rien n’est sélectionné !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "Sélection inappropriée !"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "Appliquer balise"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Changer les propriétés"
@@ -12265,11 +12293,9 @@
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
 "capabilities. Got ''{2}''"
 msgstr ""
-"valeur non autorisée pour l’attribut obligatoire \"{0}\" de type "
-"OsmPrimitiveType, reçu \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
@@ -12487,6 +12513,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12511,5 +12537,5 @@
 msgstr "Échec de l’analyse du fichier \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
@@ -12517,5 +12543,5 @@
 "un document gpx"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12531,7 +12557,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
-#, fuzzy
 msgid "Looking for image files"
-msgstr "Recherche de ligne côtière…"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
@@ -12539,15 +12564,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, fuzzy, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+"Attention : la boîte de dialogue des options n’a pu être affichée au premier "
+"plan. L’exception était : {0}"
+
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#, fuzzy, java-format
+#, java-format
 msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
-"pas de primitive d’id {0} dans le jeu de données local. Impossible de "
-"déduire le type de primitive"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308
@@ -12616,5 +12647,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "Coordonnées importées : "
@@ -12718,9 +12749,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Envoi de {0} objets…"
-msgstr[1] "Envoi de {0} objets…"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -13258,13 +13289,13 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159
-#, fuzzy, java-format
+#, java-format
 msgid "({0}/{1}) Uploading {2} object..."
 msgid_plural "({0}/{1}) Uploading {2} objects..."
-msgstr[0] "Envoi de {0} objets…"
-msgstr[1] "Envoi de {0} objets…"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
 msgid "Uploading data ..."
-msgstr "Envoi des données…"
+msgstr "Téléchargement des données..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192
@@ -13346,7 +13377,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:194
-#, fuzzy
 msgid "Click to update the activated plugins"
-msgstr "Cliquer pour fermer la boîte de dialogue."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
@@ -13359,5 +13389,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -13366,7 +13396,5 @@
 "are:"
 msgstr[0] ""
-"Le greffon {0} est requis par le greffon {1} mais n’a pu être trouvé."
 msgstr[1] ""
-"Le greffon {0} est requis par le greffon {1} mais n’a pu être trouvé."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13451,7 +13479,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:625
-#, fuzzy, java-format
+#, java-format
 msgid "Click to delete the plugin ''{0}''"
-msgstr "Cliquer pour fermer la boîte de dialogue."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
@@ -13487,7 +13515,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#, fuzzy, java-format
+#, java-format
 msgid "Click to disable the plugin ''{0}''"
-msgstr "Cliquer pour fermer la boîte de dialogue."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:731
@@ -13532,12 +13560,11 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:890
-#, fuzzy
 msgid "Do not check and ask again at startup (remembers choice)"
-msgstr "Ne plus afficher (choix mémorisé)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:69
-#, fuzzy, java-format
+#, java-format
 msgid "The plugin file ''{0}'' does not include a Manifest."
-msgstr "Le fichier \"{0}\" n’existe pas"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:181
@@ -13634,5 +13661,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13640,9 +13666,4 @@
 "file a bug report."
 msgstr ""
-"Une erreur exceptionnelle s’est produite.\n"
-"\n"
-"Ceci est toujours une erreur de programmation. Si vous utilisez la dernière\n"
-"version de JOSM, et afin d’améliorer celle-ci, merci de nous fournir un "
-"rapport d’erreur."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13737,6 +13758,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -13778,5 +13799,5 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:244
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
@@ -13784,6 +13805,4 @@
 "applet and because you did not load your applet from ''{1}''.</html>"
 msgstr ""
-"<html>Impossible de se connecter au serveur distant<br>''{0}''.<br>Vérifiez "
-"votre connexion internet.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:260
@@ -13840,5 +13859,5 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:354
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
@@ -13846,6 +13865,4 @@
 "preferences and your internet connection.</html>"
 msgstr ""
-"<html>Impossible de se connecter au serveur distant<br>''{0}''.<br>Vérifiez "
-"votre connexion internet.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:426
@@ -13865,6 +13882,6 @@
 "{1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13873,5 +13890,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -14028,4 +14045,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr "Visibilité"
@@ -14107,5 +14125,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:419
 msgid "Uploading GPX Track"
-msgstr "Envoyer la trace GPX"
+msgstr "Téléchargement de la trace GPX"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java:35
@@ -14118,5 +14136,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "Interpolation d’adresse"
@@ -14735,5 +14753,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr "Localisation"
@@ -14903,21 +14921,21 @@
 "Veuillez supprimer la zone de la relation avant de la diviser."
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr "Fichiers TangoGPS (*.log)"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr "Erreur de format : "
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr "Import de TangoGPS réussi"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr "Erreur d’import de TangoGPS !"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr "fichiers TCX (*.tcx)"
@@ -14949,9 +14967,9 @@
 msgstr "Créer un chemin dupliqué"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr "Couche d’édition des traces GPX"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Convertir en couche GPX en rendant anonyme l’horodatage"
@@ -14966,13 +14984,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr "Importer un chemin depuis le calque GPX"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr "Abandonner le chemin existant"
@@ -14981,6 +14999,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr "Pas de calque de données GPX trouvé."
@@ -15212,17 +15230,17 @@
 msgstr "Charger l’ensemble des images comme un nouveau calque."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr "Index de direction ''{0}'' non trouvé"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr "L’emplacement de départ n’est pas à l’intérieur de la bbox"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:105
 msgid "Looking for shoreline..."
 msgstr "Recherche de ligne côtière…"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -15266,42 +15284,41 @@
 msgstr "Suppression des nœuds en doublon…"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr "Trace Lakewalker"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr "Une erreur inconnue est survenue"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "Est"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "Nord-Est"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "Nord"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "Nord-Ouest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "Ouest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "Sud-Ouest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "Sud"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "Sud-Est"
@@ -15357,6 +15374,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -15365,69 +15382,69 @@
 msgstr "eau"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "ligne côtière"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "terre"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Maximum number of segments per way"
 msgstr "Nombre maximum de segments par chemin"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
 msgid "Maximum number of nodes in initial trace"
 msgstr "Nombre maximum de nœuds dans la trace initiale"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Valeur de gris maximum à considérer comme de l’eau (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
 msgid "Line simplification accuracy (degrees)"
 msgstr "Précision de la simplification des lignes (en degrés)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Résolution des dalles Landsat (pixels par degré)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Taille des dalles Landsat (en pixels)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
 msgid "Shift all traces to east (degrees)"
 msgstr "Décallage de toutes les traces vers l’est (en degrés)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
 msgid "Shift all traces to north (degrees)"
 msgstr "Décallage de toutes les traces vers len nord (en degrés)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
 msgid "Direction to search for land"
 msgstr "Direction vers laquelle chercher de la terre"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
 msgid "Tag ways as"
 msgstr "Etiquetter les chemins comme"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr "Calque WMS"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr "Taille de cache maximum (Mo)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
 msgid "Maximum cache age (days)"
 msgstr "Age maximum du cache (en jours)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:68
 msgid "Source text"
 msgstr "Texte source"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
@@ -15435,5 +15452,5 @@
 "défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -15443,5 +15460,5 @@
 "défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -15452,5 +15469,5 @@
 "défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -15461,5 +15478,5 @@
 "lignes plus précises (0.0003 par défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -15467,21 +15484,21 @@
 "Résolution des dalles Landsat, mesurée en pixels par degré (4000 par défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Taille d’une dalle Landsat, mesurée en pixels (2000 par défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Décallage de tous les points vers l’est en degrés (0 par défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Décallage de tous les points vers le nord en degrés (0 par défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Direction to search for land. Default east."
 msgstr "Direction vers laquelle chercher de la terre (est par défaut)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
@@ -15489,35 +15506,35 @@
 "rien du tout (eau par défaut)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 "Quel calque WMS faut il utiliser pour tracer contre. par défaut c’est IR-1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 "Taille maximum de chaque dossier de cache en octet. Par défaut : 300 Mo"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr "Age maximum de chaque fichier en cache. Par défaut : 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr "Texte de donnée source. Landsat par défaut."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "Un greffon pour tracer les nappes d’eau des images Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr "Préférences du greffon LakeWalker"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:50
 msgid "Downloading image tile..."
 msgstr "Téléchargement de la tuile…"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr "Impossible d’acquérir l’image"
@@ -15541,5 +15558,5 @@
 msgstr "Échec de la connexion"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr "aucun nom"
@@ -15570,5 +15587,5 @@
 msgstr "Parcours"
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr "Calque instrument LiveGPS"
@@ -15646,5 +15663,5 @@
 msgstr "Angle entre deux nœuds sélectionnés"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr "Calque où faire des mesures"
@@ -15868,9 +15885,9 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:22
 msgid "Switch to online mode"
-msgstr ""
+msgstr "Passer au mode en ligne"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:23
 msgid "Switch to offline mode"
-msgstr ""
+msgstr "Passer au mode hors ligne"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
@@ -15916,4 +15933,76 @@
 msgid "Firefox executable"
 msgstr "Exécutable Firefox"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#, fuzzy
+msgid "Read error!"
+msgstr "Bassin de retenue"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Entrer les coordonnées pour le nouveau nœud"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Garder les fichiers de sauvegarde (backup)"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Erreur"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "La date indiquée ne peut être analysée."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Impossible de renommer le fichier \"{0}\""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Garder les fichiers de sauvegarde (backup)"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "Garder les fichiers de sauvegarde (backup)"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Écrire dessus"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+#, fuzzy
+msgid "Could not delete temporary file!"
+msgstr "Impossible de trouver le type element"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
@@ -16192,6 +16281,6 @@
 msgstr "Sauvegarder les données capturées vers un fichier à chaque minute"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -16318,72 +16407,129 @@
 "préférences"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+#, fuzzy
+msgid "Terrace a house"
+msgstr "Diviser un bâtiment"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+msgid "Interpolation"
+msgstr "Interpolation"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Rues"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Plus grand nombre"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Plus petit nombre"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+#, fuzzy
+msgid "Lowest housenumber of the terraced house"
+msgstr "Inverse les numéros des maisons mitoyennes."
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Créer une nouvelle relation"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Supprimer les chemins dupliqués."
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Nom de la rue"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr "Plus petit nombre"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr "Plus grand nombre"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr "Inverser les maisons mitoyennes"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr "Inverse les numéros des maisons mitoyennes."
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr "Inverser les maisons mitoyennes"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:83
+msgid "Cannot reverse!"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:125
 msgid "Reverse Terrace"
 msgstr "Inverser les maisons mitoyennes"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr "Diviser un bâtiment"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr "Crée des bâtiments mitoyens à partir d’un long bâtiment."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr "Sélectionnez un seul chemin fermé d’au moins quatre points."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr "Bâtiments mitoyens"
@@ -16623,5 +16769,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr "Nœuds dupliqués"
@@ -16632,5 +16778,5 @@
 "Ce test vérifie si des nœuds ne sont pas exactement à la même position."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16642,9 +16788,9 @@
 "voyez pas) pourraient les utiliser.<br>Voulez-vous vraiment les supprimer ?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr "Confirmation"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr "Nœuds à la même position"
@@ -16681,5 +16827,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr "Multypoligone"
@@ -16833,7 +16979,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr "Combinaisons attribut/valeur non valide"
@@ -16841,43 +16987,43 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr "Problème de rendu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Clé \"{0}\" non valide."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr "Étiquettes avec des valeurs vides"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr "Clé de propriété invalide"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr "espace blanc dans une clé non valide"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr "Les valeurs commencent ou finissent par un espace blanc"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr "Les valeurs contiennent du code HTML"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "La clé \"{0}\" ne fait pas partie des balises prédéfinies."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr "Les balises ne contiennent pas de propriété"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
@@ -16885,39 +17031,39 @@
 "La valeur \"{0}\" pour la clé \"{1}\" n’est pas dans les balises prédéfinies."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr "Les balises ne contiennent pas de valeur de propriété"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr "Vérifier les clés de propriétés."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 "Valider que les clés sont valides en comparasion avec une liste de mots?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr "Utiliser un vérificateur de propriétés complexe."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 "Valider les étiquettes et les valeurs en utilisant des règles complexes."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr "Source de TagChecker"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16928,25 +17074,25 @@
 "données de vérification des étiquettes."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr "Ajouter une nouvelle source à la liste."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr "Modifier la source sélectionnée."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "Supprimer la source sélectionnée de la liste."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "Sources de données"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr "Vérifier les valeurs des propriétés"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
@@ -16954,9 +17100,9 @@
 "prédéfinies."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr "Vérifier les FIXMES."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
@@ -16964,54 +17110,54 @@
 "lequel attribut."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr "Vérifier les notes de rendu."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr "Vérifier si le rendu de carte a généré des erreurs."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr "Utiliser le fichier de données par défaut."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr "Utiliser le fichier de données par défaut (recommandé)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr "Utiliser la vérification orthographique par défaut."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Utiliser le fichier de vérification d’orthographe (recommandé)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr "Corriger les propriétés"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr "Impossible de trouver le type element"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr "Impossible de trouver le niveau d’avertissement"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Expression interdite \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -17469,5 +17615,5 @@
 msgstr "Calque WMS ({0}), téléchargement au zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -17478,13 +17624,17 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr "Oui, récupérer les images"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr "URL invalide ?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+msgid "Download visible tiles"
+msgstr "Télécharger les tuiles visibles"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -17493,37 +17643,33 @@
 "résolution."
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
-msgid "Download visible tiles"
-msgstr "Télécharger les tuiles visibles"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "Changer la résolution"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr "Recharger les tuiles erronées"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr "Canal alpha"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "Sauvegarder un calque WMS dans un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr "Sauvegarder la couche WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "Charger un calque WMS depuis un fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr "Charger la couche WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -17532,13 +17678,13 @@
 "attendue"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr "Erreur de format de fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "Erreur lors du chargement du fichier"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -17824,6 +17970,13 @@
 "SVG."
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17834,5 +17987,5 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
@@ -17840,5 +17993,5 @@
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr ""
@@ -17847,5 +18000,5 @@
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17857,5 +18010,5 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr ""
@@ -17863,5 +18016,5 @@
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17872,15 +18025,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permet d’ajouter des marqueurs/points sur les positions GPS courantes."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Ouvre une fenêtre de modification des attributs sous forme de table."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17893,10 +18046,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr "Crée des maisons mitoyennes depuis des blocs entiers."
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17908,5 +18061,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17917,10 +18070,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Téléchargement facile le long de plusieurs chemins interconnectés"
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -18028,6 +18181,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -18035,6 +18197,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "Référence"
@@ -18051,5 +18214,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Voies"
@@ -18071,10 +18234,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Vitesse max (km/h)"
@@ -18118,14 +18281,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "Sens unique"
@@ -18168,13 +18331,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -18212,13 +18375,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -18253,13 +18416,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "Découpe"
@@ -18294,13 +18457,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "Remblai"
@@ -18432,4 +18595,13 @@
 msgid "Edit Unclassified Road"
 msgstr "Éditer une route mineure"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr ""
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -18447,15 +18619,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr "Largeur (mètres)"
@@ -18467,5 +18639,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Rue résidentielle"
@@ -18474,5 +18646,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "Éditer une rue résidentielle"
@@ -18490,16 +18662,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Revêtement"
@@ -18521,166 +18696,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr "avec revêtement"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr "sans revêtement"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr "Asphalte"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr "béton"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr "Métal"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "bois"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr "Pavés"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr "pavés"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "gravier"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr "Graviers"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr "Compact"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr "Herbe"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "herbe"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "sable"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr "terre"
@@ -18688,5 +18870,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr "Rue résidentielle partagée entre usagers"
@@ -18695,5 +18877,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr "Éditer une rue résidentielle partagée entre usagers"
@@ -18701,5 +18883,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "Rue Piétonne"
@@ -18708,5 +18890,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "Éditer une rue piétonne"
@@ -18714,5 +18896,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr "Voie de service"
@@ -18721,5 +18903,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr "Éditer une voie d’accès"
@@ -18729,18 +18911,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr "Type Voie de service"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr "allée"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr "acceso  para vehículos (entrada a garage, etc.)"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr "parking_aisle"
@@ -18748,5 +18930,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr "Voie de parking"
@@ -18756,5 +18938,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr "Éditer une voie de parking"
@@ -18762,5 +18944,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "Route (type inconnu)"
@@ -18769,5 +18951,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "Éditer une route de type inconnu"
@@ -18776,20 +18958,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "Rue à accès restreint"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "Éditer les restrictions d’une route"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "Péage"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "Sans issue (cul-de-sac)"
@@ -18797,9 +18979,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 msgid "Access"
 msgstr "Accès"
 
 #. 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"
@@ -18810,6 +18993,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18821,4 +19002,5 @@
 #. 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"
@@ -18837,141 +19019,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+msgid "yes"
+msgstr "oui"
+
+#. 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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "privé"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+msgstr "désigné"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:219
+msgid "destination"
+msgstr "destination"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr "permis par le propriétaire"
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr "véhicules agricoles"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-msgid "yes"
-msgstr "oui"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "privé"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-msgstr "désigné"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "destination"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr "permis par le propriétaire"
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr "véhicules agricoles"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "non"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr "Biens"
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Poids-lourds"
@@ -18986,10 +19176,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr "Cheval"
@@ -19005,10 +19195,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "Motos"
@@ -19023,27 +19213,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr "Voitures"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr "Véhicules de service public"
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr "Bateaux à moteur"
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "Bateaux"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Vitesse min (km/h)"
@@ -19051,25 +19233,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "Poids max (tonnes)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr "Hauteur max. (mètres)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr "Largeur max. (mètres)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr "Longueur max. (mètres)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "Rond-point"
@@ -19080,5 +19262,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "Éditer une jonction"
@@ -19098,10 +19280,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "motorway"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr "motorway_link"
@@ -19123,10 +19305,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "voie rapide"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr "trunk_link"
@@ -19148,10 +19330,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "primary"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr "primary_link"
@@ -19173,5 +19355,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -19186,9 +19368,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "tertiary"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr "unclassified"
@@ -19202,9 +19384,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "residential"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr "living_street"
@@ -19234,10 +19416,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "service"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr "bus_guideway"
@@ -19267,5 +19449,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -19277,10 +19459,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Éditer un pont"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr "Modifier un tunnel"
@@ -19288,19 +19470,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Chemins"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "Construction"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "Éditer une route en construction"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "Jonction"
@@ -19316,5 +19498,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "roundabout"
@@ -19322,5 +19504,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr "Piste"
@@ -19329,40 +19511,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr "Éditer une route carrossable sans revêtement"
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "Piste"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "gravier"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "gravier"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "gravier"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "gravier"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "gravier"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr ""
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -19370,5 +19546,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -19376,37 +19552,32 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr "randonnée"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "VTT"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
-msgstr "Chemin de randonnée en montagne exigeant"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
-msgstr "Chemin de randonnée alpin"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
-msgstr "Chemin de randonnée alpin exigeant"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
-msgstr "Chemin de randonnée alpin difficile"
+msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "Chemin partagé"
@@ -19415,12 +19586,32 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "Editer le chemin"
 
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr "intermédiaire"
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
+
 #: build/trans_presets.java:489
-#, fuzzy
 msgid "Wheelchairs"
-msgstr "Chaise roulante"
+msgstr ""
 
 #: build/trans_presets.java:490
@@ -19436,7 +19627,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "Éditer un chemin équestre"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -19449,7 +19639,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "Éditer une voie cyclable"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -19484,24 +19673,21 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "Fusionner quand même"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "Éditer un chemin pour piétons"
+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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Éditer un chemin pour piétons"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr "Vélos"
@@ -19509,5 +19695,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "Escaliers"
@@ -19517,5 +19703,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Éditer des escaliers"
@@ -19523,10 +19709,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr "Balises"
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "Jonction autoroutière"
@@ -19534,15 +19720,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "Éditer une jonction autoroutière"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "Numéro"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "Aire de repos"
@@ -19550,5 +19736,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr "Éditer une aire de repos"
@@ -19556,5 +19742,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -19587,17 +19774,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "Compagnie"
@@ -19606,5 +19793,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "Feux tricolores"
@@ -19614,5 +19801,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr "Passage piéton"
@@ -19621,27 +19808,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr "non contrôlé"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr "feux tricolores"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "île"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr "unmarked"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr "Traversée à cheval"
@@ -19649,6 +19836,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr "Traversée à vélo"
@@ -19657,11 +19844,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr "Aide à la traversée (personne)"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr "Nom du tpe de passage (UK)"
@@ -19669,30 +19856,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr "pélican"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr "pégase"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr "tigre"
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "Stop"
@@ -19700,5 +19887,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr "Passage piéton"
@@ -19707,14 +19894,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr "Modifier passage piéton sur voie ferrée"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr "Type de nom (UK)"
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr "Mini-rond-point"
@@ -19725,14 +19958,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr "Direction"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr "sens horaire"
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr "Petit élargissement pour demi-tour"
@@ -19742,26 +19975,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "Limite de ville"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "Éditer un signe de limite de ville"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr "Nom secondaire"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 msgid "Speed Camera"
 msgstr "Radar automatique"
 
 #. 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "Téléphone d’urgence"
@@ -19769,5 +20004,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr "Descente dangereuse"
@@ -19775,5 +20010,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr "Descente très dangereuse"
@@ -19781,11 +20016,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr "Gué"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr "Modifier un gué"
@@ -19793,5 +20035,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr "Col de montagne"
@@ -19799,5 +20041,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr "Éditer un col de montagne"
@@ -19809,7 +20051,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "Altitude"
@@ -19817,5 +20059,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Barrières"
@@ -19823,5 +20065,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr "Plot"
@@ -19829,5 +20071,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr "Modifier une bitte d’amarrage"
@@ -19872,16 +20114,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "Trafic autorisé:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr "Barrière pour cycles"
@@ -19890,5 +20132,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr "Ruines"
@@ -19896,5 +20138,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr "Grille dans le sol"
@@ -19902,10 +20144,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr "Modifier une grille dans le sol"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr "Entrée de voie de bus (Allemagne)"
@@ -19913,15 +20155,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr "Pointes"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr "Modifier pointes"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "Péage"
@@ -19929,5 +20171,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "Éditer un péage"
@@ -19935,10 +20177,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr "Douane"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr "Modifier douane"
@@ -19948,5 +20190,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr "Haie"
@@ -19955,12 +20197,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:817 build/trans_presets.java:819
 msgid "Fence"
 msgstr "Barrière"
 
-#. item "Barriers/Fence"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "Mur"
@@ -19968,5 +20222,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "Rempart"
@@ -19975,5 +20229,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr "Mur de soutènement"
@@ -19985,15 +20239,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr "Entrée"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr "Editez une entrée"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "Porte"
@@ -20001,50 +20256,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr "Editer une porte"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr "Barrière"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr "Modifier une barrière"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr "Porte de clôture"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr "Modifier une Porte de clôture"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr "Barrière mobile"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr "Modifier une barrière mobile"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr "Portillon à chicane"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr "Modifier un Portillon à chicane"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr "Échalier"
@@ -20052,25 +20307,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr "Modifier un échalier"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr "Tourniquet"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr "Éditer tourniquet"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr "Écluse"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr "Modifier une écluse"
@@ -20081,11 +20336,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "Eau"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "Source"
@@ -20093,5 +20348,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "Éditer une source"
@@ -20099,5 +20354,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr "Canal d’évacuation"
@@ -20105,10 +20360,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr "Éditer un canal d’évacuation"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "Ruisseau"
@@ -20116,10 +20382,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "Éditer un ruisseau"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "Canal"
@@ -20127,10 +20393,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "Éditer un canal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "Rivière"
@@ -20140,5 +20406,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "Éditer une rivière"
@@ -20146,15 +20412,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Éditer de l’eau"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "Terre"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "Editez un terrain"
@@ -20162,15 +20428,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr "Bassin"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr "Éditer un bassin"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr "Bassin de retenue"
@@ -20178,15 +20444,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr "Éditer un bassin de retenue"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr "Réservoir couvert"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr "Éditer un réservoir couvert"
@@ -20194,5 +20460,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "Lit de rivière"
@@ -20201,10 +20467,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "Modifier lit de rivière"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr "Zone inondable"
@@ -20215,14 +20481,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr "Modifier zone inondable"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "marécages"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr "tourbière"
@@ -20236,35 +20502,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr "marais"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr "roselière"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr "marais salant"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr "étendue vaseuse"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "Terrain boueux/vase"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr "Éditer un terrain boueux"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "Plage"
@@ -20272,20 +20538,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "Éditer une plage"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "Baie"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "Éditer une baie"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "Falaise"
@@ -20293,10 +20559,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "Éditer une falaise"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "Ligne côtière"
@@ -20304,5 +20570,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "Éditer une ligne côtière"
@@ -20310,5 +20576,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "Itinéraire de ferry"
@@ -20316,5 +20582,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr "Éditer un itinéraire de ferry"
@@ -20323,5 +20589,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr "Chantier naval"
@@ -20329,10 +20595,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr "Éditer un chantier naval"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "Dock"
@@ -20340,5 +20606,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr "Éditer un dock"
@@ -20346,5 +20612,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "Barrage"
@@ -20352,15 +20618,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "Éditer un barrage"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr "Voie navigable"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr "Écluse"
@@ -20369,5 +20635,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr "Petit barrage"
@@ -20375,20 +20641,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr "Éditer une écluse"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "Cascade"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "Éditer une cascade"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr "Point de retournement"
@@ -20397,15 +20663,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr "Marina"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr "Éditer une marina"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "Jetée/Ponton"
@@ -20413,10 +20679,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "Modifier jetée/ponton"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr "Terminal de Ferry"
@@ -20424,10 +20690,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr "Editer un terminal de Ferry"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr "Slipway"
@@ -20437,20 +20703,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr "Éditer un plan incliné"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr "Transport"
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "Voie ferrée"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "Rail"
@@ -20458,5 +20724,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr "Éditer des rails"
@@ -20465,139 +20731,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr "standard"
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr "triage"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr "voie de garage"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr "embranchement"
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr "voie ferrée"
+
+#. 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:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+msgid "Voltage"
+msgstr "Tension"
+
+#. 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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr "Voie ferrée étroite"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr "Éditer une voie ferrée étroite"
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr "Monorail"
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr "Éditer un monorail"
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr "Préservé"
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr "Éditer une voie ferrée touristique"
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr "Rails légers"
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr "Éditer des rails légers"
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "Voie souterraine"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "Éditer un métro"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "Tram"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr "Éditer un tram"
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr "Voie de guidage de bus"
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr "Éditer une voie de guidage de bus"
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "Voie désaffectée"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "Éditer une voie désaffectée"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr "Types optionels"
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr "triage"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr "voie de garage"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr "embranchement"
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr "Voie ferrée étroite"
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr "Éditer une voie ferrée étroite"
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr "Monorail"
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr "Éditer un monorail"
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr "Préservé"
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr "Éditer une voie ferrée touristique"
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr "Rails légers"
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr "Éditer des rails légers"
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "Voie souterraine"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "Éditer un métro"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "Tram"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr "Éditer un tram"
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr "Voie de guidage de bus"
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr "Éditer une voie de guidage de bus"
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "Voie désaffectée"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "Éditer une voie désaffectée"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "Voie abandonnée"
@@ -20606,5 +21111,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr "Passage à niveau"
@@ -20613,5 +21118,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr "Passage à niveau"
@@ -20621,5 +21126,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr "Type de passage"
@@ -20627,5 +21132,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "Plaque tournante"
@@ -20634,10 +21139,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr "Transports aériens par câble"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "Télésiège"
@@ -20645,10 +21157,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr "Éditer un télésiège"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr "Téléski"
@@ -20656,10 +21168,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr "Éditer un téléski"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "Télécabine"
@@ -20667,10 +21179,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "Éditer un télécabine"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr "Oeufs"
@@ -20678,10 +21190,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr "Modifier Oeufs"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20689,12 +21201,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr "Éditer la station"
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "Station service"
@@ -20704,9 +21229,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Modifier station essence"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20760,32 +21342,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "Horaires d’ouverture"
@@ -20844,94 +21426,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr "24h/24 7j/7"
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lun-ven 08:30-20:00"
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Mar-dim 08:00-15:00; Sam 08:00-12:00"
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20943,5 +21601,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20951,5 +21609,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Éditer un parking"
@@ -20960,25 +21618,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr "Numéro de référence"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "parking (bâtiment)"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "surface"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr "souterrain"
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr "Parking relais"
@@ -20987,48 +21645,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "Péage/Forfait"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr "Capacité (globale)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr "Espaces pour handicapés"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr "Emplacements pour femmes"
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr "Emplacements pour parents"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Voir le Wiki pour les autres types de capacité : [types]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "Lavage"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "Editez un espace de lavage de voitures"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "Réparer"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "Editez un garagiste"
@@ -21036,5 +21694,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "Location"
@@ -21043,10 +21701,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "Éditer une location de voiture"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr "Partage"
@@ -21054,5 +21712,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr "Éditer un covoiturage"
@@ -21060,10 +21718,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "Éditer un parking à vélo"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr "Capacité"
@@ -21072,15 +21730,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "Éditer une location de vélos"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Transport public"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -21090,5 +21748,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -21096,5 +21754,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr "Référence UIC"
@@ -21102,5 +21760,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr "Halte ferroviaire"
@@ -21108,5 +21766,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr "Editez un arrêt"
@@ -21114,5 +21772,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "Arrêt de tram"
@@ -21121,5 +21779,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "Éditer un arrêt de tram"
@@ -21127,5 +21785,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "Quai"
@@ -21134,5 +21792,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "Éditer un quai"
@@ -21144,5 +21802,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr "Référence (numéro de voie)"
@@ -21150,10 +21808,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr "Surface"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "Bouche de métro"
@@ -21162,10 +21820,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "Éditer une bouche de métro"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr "Chaise roulante"
@@ -21174,5 +21832,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "Gare routière"
@@ -21181,5 +21839,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "Éditer une gare routière"
@@ -21187,5 +21845,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "Arrêt de bus"
@@ -21195,5 +21853,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "Éditer un arrêt de bus"
@@ -21202,25 +21860,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr "Abri"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "Banc"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr "Plateforme de bus"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr "Éditer une plateforme de bus"
@@ -21228,5 +21887,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "Taxi"
@@ -21234,5 +21893,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "Editez une station de taxi"
@@ -21240,32 +21899,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "Aéroport"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr "Modifier aéroport"
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr "IATA"
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr "ICAO"
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+msgid "Beacon"
+msgstr "Balise signalétique"
+
+#. 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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr "Voyage"
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Hôtel"
@@ -21277,5 +22031,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hôtel"
@@ -21284,15 +22038,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "Éditer un hôtel"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "Étoiles"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr "Môtel"
@@ -21300,20 +22054,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr "Éditer un motel"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr "Chambre d’hôte"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr "Éditer une chambre d’hôte"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "Châlet"
@@ -21321,10 +22075,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr "Editez un châlet"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr "Hôtel"
@@ -21332,30 +22086,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr "Éditer une auberge de jeunesse"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr "Chalet"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr "Modifier chalet"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr "Site pour caravane"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr "Éditer un  site pour caravane"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "Camping"
@@ -21363,10 +22117,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr "Éditer un camping"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Nourriture & boissons"
@@ -21377,5 +22131,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -21383,5 +22137,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "Éditer un restaurant"
@@ -21389,5 +22143,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr "Cuisine"
@@ -21395,61 +22149,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "italien"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "chinois"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "greque"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "allemand"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "indien"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "régional"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "turque"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "asiatique"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "thaïlandais"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "mexicain"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "japonais"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -21457,9 +22223,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "Éditer un fast food"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "Café"
@@ -21467,9 +22241,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "Editez un café"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "Bar"
@@ -21477,18 +22251,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "Pub"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr "Éditer un biergarten"
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr "Bar"
@@ -21496,9 +22270,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr "Modifier Bar"
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "Boîte de nuit"
@@ -21506,24 +22280,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "Éditer une boîte de nuit"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Tourisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr "Editez une attraction"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Musée"
@@ -21531,9 +22305,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Éditer un musée"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Zoo"
@@ -21542,9 +22316,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Editez un Zoo"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "Point de vue"
@@ -21552,24 +22326,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "Éditer un point de vue"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr "Tour de surveillance"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "Parc d’attraction"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr "Éditer un parc d’attraction"
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "Oeuvre d’art"
@@ -21577,5 +22351,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "Éditer une oeuvre d’art"
@@ -21583,19 +22357,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr "Office du Tourisme"
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Carte"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr ""
@@ -21633,5 +22407,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -21639,28 +22413,28 @@
 msgstr "rue"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr "Schéma"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr "Zone affichée"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr "Site"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr "Ville"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr "Région"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr "Description détaillée"
@@ -21670,5 +22444,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr "Routes affichées pour :"
@@ -21676,5 +22450,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr "Chemin de randonnée"
@@ -21682,6 +22456,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "Cyclisme"
@@ -21689,5 +22463,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr "VTT"
@@ -21695,6 +22469,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "Ski"
@@ -21702,5 +22476,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr "Equitation"
@@ -21708,46 +22482,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr "…autres modes de transport possibles"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr "Bureau d’informations"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr "Contenu du panneau"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr "Remarque"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "histoire"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr "nature"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr "faune"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr "Usines"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr "Poteau indicateur"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr "Poste d’informations"
@@ -21755,29 +22529,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr "Description précise"
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr "Guide audio"
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr "Guide audio via téléphone mobile ?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr "Numéro de téléphone"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr "Autre points d’information"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr "Éditer un abri"
@@ -21785,25 +22559,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr "Âtre"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "Site de pique-nique"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "Éditer un site de pique-nique"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Patrimoine"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Château"
@@ -21812,19 +22586,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Éditer un château"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Ruines"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Éditer des ruines"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Site archéologique"
@@ -21833,9 +22607,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "Éditer un site archéologique"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "Lieu de bataille"
@@ -21843,10 +22617,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "Éditer un lieu de bataille"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr "Site paléontologique"
@@ -21854,5 +22628,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr "Éditer un site paléontologique"
@@ -21860,15 +22634,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "Monument commémoratif"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "Editez un monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "Mémorial"
@@ -21876,55 +22650,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "Éditer un mémorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr "Croix"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr "Éditer une croix"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr "Chapelle"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr "Éditer une Chapelle"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr "Pierre frontalière"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr "Éditer Pierre frontalière"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Loisir"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "Parc aquatique"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "Éditer un parc aquatique"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Aire de jeux"
@@ -21932,35 +22706,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Éditer une zone de jeu"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Pêche"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "Éditer un lieu de pêche"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr "Sports"
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr "Sport"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Stade"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Éditer un stade"
@@ -21974,6 +22748,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "Selectionner un sport:"
@@ -22365,6 +23139,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -22398,225 +23172,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "tir à l’arc"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr "athletics"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr "boules"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr "canoë"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "climbing"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr "cricket_nets"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "cycling"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr "dog_racing"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr "équitation"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "gymnastics"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr "horse_racing"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr "moteur"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr "pelote"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "chasse"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr "skate"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "ski"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "football"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "swimming"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "table_tennis"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "Centre sportif"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "Éditer un centre sportif"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr "Terrain de sport"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr "Éditer un terrain de sport"
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr "Circuit"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr "Éditer un circuit"
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "Parcours de Golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "Éditer un terrain de golf"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "Éditer un minigolf"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr "Editer Multi"
@@ -22655,21 +23429,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "type"
@@ -22708,203 +23482,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr "Terrain"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "sports_centre"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "stadium"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr "№piste"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr "Éditer un Bowling"
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr "Athlétisme"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr "Éditer athlétisme"
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "Tir à l’arc"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "Éditer tir à l’arc"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "Escalade"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "Éditer escalade"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr "Canoë"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr "Éditer canoë"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr "Éditer cyclisme"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "Course de chiens"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr "Éditer course de chiens"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr "Equitation"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr "Éditer sports équestres"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr "Course de chevaux"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr "Éditer course de chevaux"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "Gymnastique"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr "Éditer gymnastique"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "Sports mécaniques"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr "Éditer sports mécaniques"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr "Skate"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr "Éditer patin à roulettes"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr "Éditer skateboard"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "Natation"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "Éditer natation"
@@ -22912,56 +23686,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr "ski"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr "Type de piste"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr "de descente"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr "nordique"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr "snow park"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr "Difficulté"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr "verte"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr "bleue"
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr "intermédiaire"
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr "avancé"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr "jaune"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "Tirer"
@@ -22969,182 +23739,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "Éditer tir sportif"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "Sport de balle"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "Football"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr "Éditer football"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "Football"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr "Éditer football"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr "Football australien"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr "Éditer football australien"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr "Éditer baseball"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "Éditer basketball"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr "Editer un Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr "Boules"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr "Éditer boules"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr "Boules"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr "Éditer bowls"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr "Éditer cricket"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr "Filets de cricket"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr "Éditer filets de cricket"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr "Éditer croquet"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "Éditer hockey"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr "Pelote"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr "Éditer pelote basque"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr "Sports de raquette"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr "Éditer sports de raquette"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr "Éditer rugby"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "Tennis de table"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "Éditer tennis de table"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "Éditer tennis"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr "Artificiel"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Bâtiments"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "Bâtiment"
@@ -23152,5 +23922,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Bâtiment officiel"
@@ -23158,10 +23928,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Éditer un bâtiment officiel"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "Mairie"
@@ -23169,10 +23939,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Éditer une mairie"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Ambassade"
@@ -23180,10 +23950,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Editer une ambassade"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "Palais de justice"
@@ -23192,10 +23962,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Éditer un palais de justice"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Prison"
@@ -23204,10 +23974,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Éditer une prison"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Poste de police"
@@ -23217,10 +23987,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Éditer un poste de police"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "Caserne de pompiers"
@@ -23229,10 +23999,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Éditer une caserne de pompiers"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Bureau de poste"
@@ -23240,5 +24010,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Éditer un bureau de poste"
@@ -23246,15 +24016,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "Jardin d’enfants"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "Éditer un jardin d’enfants"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "École"
@@ -23262,10 +24032,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "Éditer une école"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "Université"
@@ -23273,10 +24043,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "Éditer une université"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "Établissement d’enseignement supérieur"
@@ -23284,5 +24054,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "Éditer un établissement d’enseignement supérieur"
@@ -23290,5 +24060,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Cinema"
@@ -23297,10 +24067,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Éditer un cinéma"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "Bibliothèque"
@@ -23309,9 +24079,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Éditer une bibliothèque"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "Centre artistique"
@@ -23319,10 +24089,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "Éditer un centre artistique"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Théâtre"
@@ -23331,10 +24101,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Éditer un théatre"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "Lieu de culte"
@@ -23344,5 +24114,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "Éditer un lieu de culte"
@@ -23351,6 +24121,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "Religion"
@@ -23359,66 +24129,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "christian"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "jewish"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr "unitarisme"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr "Dénomination"
@@ -23427,81 +24197,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr "anglican"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "catholique"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr "evangelical"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr "jehovahs_witness"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Adresses"
@@ -23510,5 +24280,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Editez l’adresse"
@@ -23516,5 +24286,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "Numéro du bâtiment"
@@ -23522,25 +24292,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "Nom de la maison"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Nom de la rue"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "Nom de la ville"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Code postal"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "Indicatif du pays"
@@ -23549,5 +24319,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "Éditer l’interpolation d’adresse"
@@ -23555,61 +24325,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr "Schéma de numérotation"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "pair"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "impair"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr "alphabétique"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr "Édifices"
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "Usine"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "Éditer une usine"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Structure de hauteur"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Éditer une structure de hauteur"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr "Type de pylône"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr "communication"
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr "observation"
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr "Hauteur (mètres)"
@@ -23617,25 +24387,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Château d’eau"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Éditer un château d’eau"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "Gazomètre"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "Éditer un gazomètre"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "Phare"
@@ -23643,10 +24413,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Éditer un phare"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Moulin à vent"
@@ -23654,10 +24424,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Éditer un moulin à vent"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Canalisation"
@@ -23666,37 +24436,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Éditer une canalisation"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
+msgid "gas"
+msgstr "gaz"
+
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr "chaleur"
+
+#: build/trans_presets.java:2353
 msgid "oil"
 msgstr "pétrole"
 
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-msgid "gas"
-msgstr "gaz"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr "égouts"
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr "chaleur"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr "toute substance"
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr "sous l’eau"
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr "aérien"
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "Station d’épuration"
@@ -23706,10 +24476,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "Éditer une station d’épuration"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Grue"
@@ -23717,21 +24487,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Éditer une grue permanente"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr "Balise signalétique"
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr "Editer balise signalétique"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "Équipement de topographie"
@@ -23739,10 +24504,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "Éditer un équipement de topographie"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -23750,11 +24515,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Éditer une caméra de surveillance"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "Centrale électrique"
@@ -23764,35 +24541,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "Éditer une centrale électrique"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "hydro"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "charbon"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr "photovoltaïque"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "Station électrique"
@@ -23801,10 +24578,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "Editez une station électrique"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "Transformateur électrique"
@@ -23813,5 +24590,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "Modifier transformateur électrique"
@@ -23819,10 +24596,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr "Champ de vision"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "Pylône électrique"
@@ -23833,23 +24610,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "Éditer un pylône électrique"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr "pylônes"
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr "Référence du pylône"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "Ligne haute tension"
@@ -23858,79 +24635,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "Editer une ligne haute tension"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr "Type de ligne"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr "ligne"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr "ligne mineure"
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "Tension"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr "Nombre de câbles"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr "simple"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr "double"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr "quadruple"
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr "Équipements"
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Toilettes"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "Boîte aux lettres"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Téléphone"
@@ -23939,5 +24711,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Éditer un téléphone"
@@ -23945,5 +24717,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Pièces"
@@ -23951,5 +24723,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "Billets"
@@ -23957,5 +24729,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr "Cartes de crédit temporaire"
@@ -23963,5 +24735,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr "Cartes de débit"
@@ -23969,15 +24741,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Cartes de crédits"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Cartes téléphoniques"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Recyclage"
@@ -23986,5 +24758,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Éditer un point de recylcage"
@@ -23992,63 +24764,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "Canettes"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "Vêtements"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "Verre"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "Ferrailleur"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+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:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr "Accoudoir"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr "Matériau"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr "pierre"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr "plastique"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr "Couleur"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr "noir"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr "marron"
@@ -24127,5 +24910,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -24135,31 +24918,31 @@
 msgstr "espace vert"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr "rouge"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr "bleu"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr "gris"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr "blanc"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr "Nombre de places"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr "Hutte de chasse"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr "Hutte de chasse"
@@ -24168,30 +24951,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "Hauteur"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr "faible"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr "à moitié"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr "complet"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr "Masquer"
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr "Verrouiller"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "Fontaine"
@@ -24200,10 +24983,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "Éditer une fontaine"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "Eau potable"
@@ -24212,10 +24995,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Éditer un point d’eau potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr "Tour d’abandon (nouveau né)"
@@ -24223,15 +25019,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr "Éditer un tour d’abandon"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Magasins"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr "Concessionnaire automobile"
@@ -24239,10 +25035,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "Éditer une concession/réparation"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr "Boutique de Cycles"
@@ -24251,28 +25047,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "Éditer un magasin de vélo"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "Supermarché"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "Éditer un supermarché"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr "Droguerie"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr "Éditer la droguerie"
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr "Commerce de proximité"
@@ -24280,9 +25076,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr "Éditer une épicerie"
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "Kiosque à journaux"
@@ -24290,27 +25086,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "Éditer un kiosque à journaux"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr "Librairie"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr "Éditer librairie"
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr "Agence de voyage"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr "Éditer agence de voyage"
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "Distributeur automatique"
@@ -24318,5 +25114,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "Éditer un distributeur automatique"
@@ -24324,88 +25120,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "Produits vendus"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr "public_transport_tickets"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr "public_transport_plans"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr "parking_tickets"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "food"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "drinks"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "bonbons"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "animal_food"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "news_papers"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "jouets"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "stamps"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "SIM-cards"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr "telephone_vouchers"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "condoms"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr "excrement_bags"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr "Cartes de fidélité"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "Boucherie"
@@ -24413,9 +25209,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Éditer une boucherie"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "Boulanger"
@@ -24423,9 +25219,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Éditer une boulangerie"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "Fleuriste"
@@ -24433,18 +25229,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "Modifier fleuriste"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr "Boutique bio"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr "Modifier boutique bio"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr "Alcool"
@@ -24452,54 +25248,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr "Modifier commerce d’acool"
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr "Boissons"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr "Modifier débit de boissons"
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr "Informatique"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "Modifier magasin informatique"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr "Électronique"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "Modifier magasin d’électronique"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr "Hi-Fi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr "Modifier boutique Hi-Fi"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr "Ameublement"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "Modifier magasin d’ameublement"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr "Jardinerie"
@@ -24507,9 +25303,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr "Modifier jardinerie"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr "Quincaillerie"
@@ -24517,9 +25313,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr "Modifier quincaillerie"
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "Magasin de bricolage"
@@ -24527,54 +25323,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "Éditer un magasin de bricolage"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr "Papeterie"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr "Modifier papeterie"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "Coiffeur"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "Editez un Coiffeur"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr "Magasin de chaussures"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "Modifier magasin de chaussures"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr "Jouets"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "Modifier magasin de jouets"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr "Vidéoclub"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr "Modifier vidéoclub"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Pressing"
@@ -24582,9 +25378,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Éditer un pressing"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Laverie libre-service"
@@ -24592,9 +25388,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Éditer une laverie"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr "Magasin de sports d’extérieur"
@@ -24602,28 +25398,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr "Éditer un magasin de sports d’extérieur"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr "Modifier magasin de sport"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr "Opticien"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "Modifier opticien"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Argent"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Banque"
@@ -24631,14 +25427,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Editez une banque"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "Distributeur automatique"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Bureau de change"
@@ -24646,5 +25442,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Éditer un bureau de change"
@@ -24652,15 +25448,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Éditer un distributeur automatique"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Santé"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "Médecin"
@@ -24668,18 +25464,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "Modifier Médecin"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "Dentiste"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "Editez le Dentiste"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Pharmacie"
@@ -24687,5 +25483,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Éditer pharmacie"
@@ -24693,9 +25489,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr "Dispensaire"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Hôpital"
@@ -24703,10 +25499,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Éditer hôpital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr "Point d’accès d’urgence"
@@ -24715,5 +25511,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr "Éditer point d’accès d’urgence"
@@ -24722,20 +25518,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr "Numéro du point"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr "Nom du point"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "Numéro de téléphone"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utiliser le code international, comme +12-345-67890"
@@ -24743,5 +25539,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "Vétérinaire"
@@ -24750,64 +25546,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "Editez un Vétérinaire"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr "Géographie"
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Lieux/endroits"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Continent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Éditer un continent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "Pays"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Éditer un pays"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "Département"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "Éditer un état"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "Région"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "Éditer une région"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr "Comté/Canton"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr "Éditer un comté/canton"
@@ -24815,15 +25611,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "Ville de plus de 100 000 habitants"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "Editez la ville"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "Ville 10 000 à 100 000 habitants"
@@ -24831,10 +25627,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "Editez la ville"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "Banlieue"
@@ -24842,25 +25638,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "Éditer une banlieue"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Village"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Éditer un village"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "Hameau"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "Éditer un hameau"
@@ -24868,5 +25664,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr "Lieu-dit"
@@ -24874,10 +25670,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr "Éditer un lieu-dit"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "île"
@@ -24885,10 +25681,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Éditer une île"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr "îlot"
@@ -24896,5 +25692,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr "Éditer l’îlot"
@@ -24902,5 +25698,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "Entrée de grotte"
@@ -24908,10 +25704,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "Éditer une entrée de grotte"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Sommet"
@@ -24919,10 +25715,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Modifier un pic"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "Glacier"
@@ -24930,10 +25726,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "Éditer un glacier"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "Volcan"
@@ -24941,70 +25737,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "Éditer un volcan"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Frontières"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "Nationale"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "Éditer une frontière nationale"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "Éditer une frontière administrative"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr "Civile"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr "Éditer une frontière civile"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr "Politique"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "Éditer une zone électorale"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr "Parc national"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "Éditer les frontières d’un parc national"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Utilisation du terrain"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Arbre"
@@ -25013,15 +25809,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Éditer un arbre isolé"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "Nom botanique"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "Bois"
@@ -25030,5 +25826,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "Éditer un bois"
@@ -25036,17 +25832,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "coniferous"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "deciduous"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "mixed"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "Forêt"
@@ -25055,14 +25851,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "Éditer une forêt"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "Réserve naturelle"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "Éditer une réserve naturelle"
@@ -25070,25 +25866,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr "Zone d’éboulements"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr "Éditer une zone d’éboulements"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr "Broussailles"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr "Éditer des broussailles"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr "Talus"
@@ -25096,10 +25892,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr "Éditer un talus"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr "Lande"
@@ -25107,5 +25903,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "Éditer une lande"
@@ -25113,5 +25909,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr "Bâtiments de ferme"
@@ -25120,45 +25916,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr "Éditer des bâtiments de ferme"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "Terrains de ferme"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr "Éditer des terrains de ferme"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr "Prairie"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr "Editer prairie"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "Vigne"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "Éditer une vigne"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr "Jardins familiaux"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr "Éditer des jardins familiaux"
@@ -25166,25 +25962,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "Jardin"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "Éditer un jardin"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "Herbe"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr "Éditer de l’herbe"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr "Zone publique herborée"
@@ -25192,10 +25988,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr "Éditer une zone publique herborée"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr "Espace commun"
@@ -25203,20 +25999,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr "Éditer un espace commun"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "Parc"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "Editez un Parc"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr "Aire de jeux"
@@ -25224,5 +26020,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr "Éditer une aire de jeux"
@@ -25230,15 +26026,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "Zone résidentielle"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr "Éditer une zone résidentielle"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "Petit cimetière"
@@ -25246,9 +26042,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Éditer un petit cimetière"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "Cimetière"
@@ -25256,39 +26052,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "Éditer un cimetière"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "Zone commerciale"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr "Éditer une zone commerciale"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "Bureaux"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr "Éditer des bureaux"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "Zone industrielle"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr "Éditer une zone industrielle"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr "Zone ferroviaire"
@@ -25296,15 +26092,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr "Éditer une zone ferroviaire"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "Militaire"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr "Éditer un terrain militaire"
@@ -25312,50 +26108,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "Zone de construction"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "Éditer un chantier"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr "Terrain en friche"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr "Éditer un terrain en friche"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr "Espace vert"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr "Éditer une nouvelle zone de construction"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr "Décharge"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr "Éditer une décharge"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "Carrière"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "Éditer une carrière"
@@ -25365,5 +26161,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr "Modifier un multipolygone"
@@ -25372,10 +26168,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr "segment extérieur"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr "segment intérieur"
@@ -25383,5 +26179,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr "Interdiction de tourner"
@@ -25390,5 +26186,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr "Modifier une interdiction de tourner"
@@ -25396,34 +26192,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr "Interdiction de tourner à gauche"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr "Interdiction de tourner à droite"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr "Interdiction d’aller tout droit"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr "Interdiction de faire demi-tour"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr "Obligation de tourner à droite"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr "Obligation de tourner à gauche"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr "Obligation d’aller tout droit"
@@ -25432,15 +26228,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr "chemin d’origine"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr "nœud ou chemin de passage"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr "chemin destination"
@@ -25448,5 +26244,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr "Route"
@@ -25455,5 +26251,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr "Modifier une route"
@@ -25461,5 +26257,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr "Type de route"
@@ -25550,5 +26346,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -25558,17 +26354,17 @@
 msgstr "vélo/bicyclette"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr "route"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr "ski"
@@ -25628,5 +26424,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -25635,9 +26431,9 @@
 msgstr "piéton"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr "détour"
@@ -25651,10 +26447,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "métro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr "Description du symbole"
@@ -25662,31 +26458,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr "Réseau"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr "État de la route"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr "proposé"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr "alternatif"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr "temporaire"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr "connexion"
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr "Couleur (hexa)"
@@ -25695,107 +26491,32 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr "segment de route"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr "segment suivant"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr "segment précédent"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr "point d’arrêt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr "point d’arrêt suivant"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 msgid "backward halt point"
 msgstr "point d’arrêt précédent"
-
-#. <!--
-#. 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 "standard"
 
 #. mappaint style named "standard"
@@ -26331,77 +27052,4 @@
 msgid "highway_track"
 msgstr "piste"
-
-#. 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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
-msgstr "voie ferrée"
 
 #. color rail
@@ -26789,7 +27437,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "baptist"
+msgstr ""
 
 #. color manmade
@@ -29928,127 +30575,48 @@
 msgstr "Sicile - Italie"
 
-#~ msgid "The plugin could not be removed. Probably it was already disabled"
-#~ msgstr ""
-#~ "Le greffon ne peut pas être supprimé. Il était probablement déjà "
-#~ "désactivé."
-
-#~ msgid "Bridleway"
-#~ msgstr "Chemin équestre"
-
-#~ msgid "Cycleway"
-#~ msgstr "Voie cyclable"
-
-#~ msgid "Footway"
-#~ msgstr "Voie piétonne"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Piste grade 1"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Éditer une piste grade 1"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Piste grade 2"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Éditer une piste grade 2"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Piste grade 3"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Éditer une piste grade 3"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Piste grade 4"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Éditer une piste grade 4"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Piste grade 5"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Éditer une piste grade 5"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Éditer un chemin de randonnée"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "Chemin de randonnée en montagne"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Éditer un chemin de randonnée en montagne"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Éditer un chemin de randonnée en montagne exigeant"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Éditer un chemin de randonnée alpin"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Éditer un chemin de randonnée alpin exigeant"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Éditer un chemin de randonnée alpin difficile"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "requis : Id > 0 obtenu : {0}"
-
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "Le paramètre ''{0}'' ne doit pas être nul."
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "le paramètre \"{0}\" ne doit pas être nul."
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "Instance de OsmDataLayer ou GpxLayer attendue. \"{0}\" trouvé."
-
-#~ msgid ""
-#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
-#~ "This can lead to nodes being deleted accidentally.\n"
-#~ "Are you really sure to continue?"
-#~ msgstr ""
-#~ "Le(s) chemin(s) sélectionné(s) contien(nen)t des nœuds en dehors de la "
-#~ "zone téléchargée.\n"
-#~ "Certains nœuds utilisés en dehors de la zone pourraient être supprimés "
-#~ "accidentellement.\n"
-#~ "Voulez-vous vraiment continuer ?"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Impossible d’annuler la commande « {0} » parce que la couche « {1} » n’est "
-#~ "plus présente"
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "Le paramètre ''{0}'' ne doit pas être vide."
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "le paramètre \"{0}\" n’est pas une classe acceptable, reçu \"{1}"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr "paramètre \"{0}\" compris entre 0 et {1} attendu, reçu {2}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "Paramètre \"{0}\" > 0 attendu, reçu \"{1}\"."
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "paramètre en dehors de la plage : reçu {0}"
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "index de colonne inattendu. Reçu {0}"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "Le paramètre 'col' doit être 0 ou 1. Reçu {0}"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "Le paramètre \"{0}\" ne doit pas être vide."
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Conflits dans les données"
+#~ msgid "Move"
+#~ msgstr "Déplacer"
+
+#~ msgid "Data Layer"
+#~ msgstr "Calque de données"
+
+#~ msgid "No data imported."
+#~ msgstr "Aucune donnée importée"
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Sélectionner un marque-page en premier."
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Aucun document ouvert donc rien à sauvegarder."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Extension de fichier inconnue."
+
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Load Selection"
+#~ msgstr "Charger la sélection"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Résoudre les conflits"
+
+#~ msgid "Delete the selected layer."
+#~ msgstr "Supprimer le calque sélectionné."
+
+#~ msgid "No time for point {0} x {1}"
+#~ msgstr "Aucune heure pour le point {0}·x·{1}"
+
+#~ msgid "No images with readable timestamps found."
+#~ msgstr "Aucune image avec des informations horaires lisibles trouvée."
+
+#~ msgid "GPS start: {0}"
+#~ msgstr "Allumage du GPS : {0}"
+
+#~ msgid "GPS end: {0}"
+#~ msgstr "Extinction du GPS : {0}"
+
+#~ msgid "timezone difference: "
+#~ msgstr "différence de fuseau horaire : "
 
 #~ msgid "image"
@@ -30056,59 +30624,4 @@
 #~ msgstr[0] "image"
 #~ msgstr[1] "images"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-#~ msgstr "paramètre \"{0}\" >=0 attendu, reçu \"{1}\""
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr ""
-#~ "Le greffon {0} nécessite la mise à jour de JOSM vers la version {1}."
-
-#~ msgid "<html>"
-#~ msgstr "<html>"
-
-#~ msgid "Move"
-#~ msgstr "Déplacer"
-
-#~ msgid "Data Layer"
-#~ msgstr "Calque de données"
-
-#~ msgid "No data imported."
-#~ msgstr "Aucune donnée importée"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Sélectionner un marque-page en premier."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Aucun document ouvert donc rien à sauvegarder."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Extension de fichier inconnue."
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Load Selection"
-#~ msgstr "Charger la sélection"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Résoudre les conflits"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Supprimer le calque sélectionné."
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Aucune heure pour le point {0}·x·{1}"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Aucune image avec des informations horaires lisibles trouvée."
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "Allumage du GPS : {0}"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "Extinction du GPS : {0}"
-
-#~ msgid "timezone difference: "
-#~ msgstr "différence de fuseau horaire : "
 
 #~ msgid "{0} within the track."
@@ -30244,4 +30757,43 @@
 #~ msgid "Navigation"
 #~ msgstr "Navigation"
+
+#~ msgid "Motorboat"
+#~ msgstr "Bateaux à moteur"
+
+#~ msgid "Boat"
+#~ msgstr "Bateaux"
+
+#~ msgid "Cycleway"
+#~ msgstr "Voie cyclable"
+
+#~ msgid "Track Grade 1"
+#~ msgstr "Piste grade 1"
+
+#~ msgid "Track Grade 2"
+#~ msgstr "Piste grade 2"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "Piste grade 3"
+
+#~ msgid "Track Grade 4"
+#~ msgstr "Piste grade 4"
+
+#~ msgid "Track Grade 5"
+#~ msgstr "Piste grade 5"
+
+#~ msgid "Edit Hiking"
+#~ msgstr "Éditer un chemin de randonnée"
+
+#~ msgid "Mountain Hiking"
+#~ msgstr "Chemin de randonnée en montagne"
+
+#~ msgid "Edit Mountain Hiking"
+#~ msgstr "Éditer un chemin de randonnée en montagne"
+
+#~ msgid "Edit Demanding Mountain Hiking"
+#~ msgstr "Éditer un chemin de randonnée en montagne exigeant"
+
+#~ msgid "Edit Alpine Hiking"
+#~ msgstr "Éditer un chemin de randonnée alpin"
 
 #~ msgid "Shop"
@@ -30339,4 +30891,10 @@
 #~ msgstr "nom"
 
+#~ msgid "Bridleway"
+#~ msgstr "Chemin équestre"
+
+#~ msgid "Footway"
+#~ msgstr "Voie piétonne"
+
 #~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
 #~ msgstr "Le transfert a été interrompu sur erreur (attente de 5 secondes) :"
@@ -30445,7 +31003,4 @@
 #~ msgstr "Aide sur le greffon WMS"
 
-#~ msgid "Station"
-#~ msgstr "Station"
-
 #~ msgid "Edit Station"
 #~ msgstr "Éditer la station"
@@ -30460,9 +31015,4 @@
 #~ msgstr "Charge"
 
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr ""
-#~ "Veuillez sélectionner des chemins avec des angles droits afin de les "
-#~ "orthogonaliser."
-
 #~ msgid "Drawbridge"
 #~ msgstr "Pont-levis"
@@ -30473,7 +31023,4 @@
 #~ msgid "bicyclemap"
 #~ msgstr "carte de randonnée cycliste"
-
-#~ msgid "board"
-#~ msgstr "tableau"
 
 #~ msgid "Split way segment"
@@ -30734,7 +31281,4 @@
 #~ msgstr "Cette sélection rend votre trace publique dans openstreetmap.org"
 
-#~ msgid "Public"
-#~ msgstr "Public"
-
 #~ msgid "Lambert Zone 2 cache file (.2)"
 #~ msgstr "Fichier tampon de la zone Lambert 2 (.2)"
@@ -30859,7 +31403,4 @@
 #~ msgid "Synchronize Time with GPS Unit"
 #~ msgstr "Synchroniser l’heure avec l’instrument GPS"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "La date indiquée ne peut être analysée."
 
 #~ msgid "Login name (email) to the OSM account."
@@ -30972,4 +31513,25 @@
 #~ msgstr "Type de bureau"
 
+#~ msgid "Edit Track of grade 1"
+#~ msgstr "Éditer une piste grade 1"
+
+#~ msgid "Edit Track of grade 2"
+#~ msgstr "Éditer une piste grade 2"
+
+#~ msgid "Edit Track of grade 3"
+#~ msgstr "Éditer une piste grade 3"
+
+#~ msgid "Edit Track of grade 4"
+#~ msgstr "Éditer une piste grade 4"
+
+#~ msgid "Edit Track of grade 5"
+#~ msgstr "Éditer une piste grade 5"
+
+#~ msgid "Edit Demanding Alpine Hiking"
+#~ msgstr "Éditer un chemin de randonnée alpin exigeant"
+
+#~ msgid "Edit Difficult Alpine Hiking"
+#~ msgstr "Éditer un chemin de randonnée alpin difficile"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Modifier un pont-levis"
@@ -31003,7 +31565,4 @@
 #~ msgid "Optional"
 #~ msgstr "Optionnel"
-
-#~ msgid "Interpolation"
-#~ msgstr "Interpolation"
 
 #~ msgid ""
@@ -31106,4 +31665,7 @@
 #~ msgstr "le paramètre {0} ne peut pas être vide"
 
+#~ msgid ">"
+#~ msgstr ">"
+
 #~ msgid "Apply partial resolutions"
 #~ msgstr "Appliquer la résolution partielle"
@@ -31118,4 +31680,8 @@
 #~ msgid "Select a starting node on the end of a way"
 #~ msgstr "Sélectionner le nœud de départ à la fin d'un chemin"
+
+#~ msgid "Plugin {0} requires JOSM update to version {1}."
+#~ msgstr ""
+#~ "Le greffon {0} nécessite la mise à jour de JOSM vers la version {1}."
 
 #~ msgid "Checking whether node {0} is gone ..."
@@ -31306,4 +31872,7 @@
 #~ msgstr "Téléchargement des référents..."
 
+#~ msgid "Conflicts in data"
+#~ msgstr "Conflits dans les données"
+
 #~ msgid "Linked"
 #~ msgstr "Lié"
@@ -31335,4 +31904,9 @@
 #~ msgid "Delete all"
 #~ msgstr "Tout supprimer"
+
+#~ msgid "The plugin could not be removed. Probably it was already disabled"
+#~ msgstr ""
+#~ "Le greffon ne peut pas être supprimé. Il était probablement déjà "
+#~ "désactivé."
 
 #~ msgid ""
@@ -31415,4 +31989,7 @@
 #~ msgstr "Remplacer"
 
+#~ msgid "<html>"
+#~ msgstr "<html>"
+
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr "Page d’aide manquante. Créez-la en <A HREF=\"{0}\">français</A>."
@@ -31448,6 +32025,15 @@
 #~ msgstr "Utiliser ensemble de changements ouvert"
 
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr "Instance de OsmDataLayer ou GpxLayer attendue. \"{0}\" trouvé."
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "valeur inattendue retournée. Reçue {0}"
+
+#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "Paramètre \"{0}\" > 0 attendu, reçu \"{1}\"."
+
+#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
+#~ msgstr "le paramètre \"{0}\" n’est pas une classe acceptable, reçu \"{1}"
 
 #~ msgid "There's no primitive with version {0} in this history."
@@ -31458,4 +32044,7 @@
 #~ "Il n’y a pas de version valide à la date du \"{0}\" dans cet historique"
 
+#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
+#~ msgstr "paramètre \"{0}\" compris entre 0 et {1} attendu, reçu {2}"
+
 #~ msgid "No earliest version found. History is empty."
 #~ msgstr "pas de verison plus ancienne trouvée. L’historique est vide."
@@ -31463,4 +32052,16 @@
 #~ msgid "No latest version found. History is empty."
 #~ msgstr "pas de version plus récente trouvée. L’historique est vide."
+
+#~ msgid "Parameter current out of range. Got {0}."
+#~ msgstr "paramètre en dehors de la plage : reçu {0}"
+
+#~ msgid "Unexpected column index. Got {0}."
+#~ msgstr "index de colonne inattendu. Reçu {0}"
+
+#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
+#~ msgstr "Le paramètre 'col' doit être 0 ou 1. Reçu {0}"
+
+#~ msgid "Parameter ''{0}'' must not be empty."
+#~ msgstr "Le paramètre \"{0}\" ne doit pas être vide."
 
 #~ msgid "Index out of bounds. Got {0}."
@@ -31486,10 +32087,25 @@
 #~ "(>=0), reçu \"{1}\""
 
+#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
+#~ msgstr "paramètre \"{0}\" >=0 attendu, reçu \"{1}\""
+
 #~ msgid "NullPointerException, possibly some missing tags."
 #~ msgstr ""
 #~ "Échec (NullPointerException). Sans doute parce qu'il manque des attributs."
 
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "Le paramètre ''{0}'' ne doit pas être nul."
+
 #~ msgid "No type found. History is empty."
 #~ msgstr "Pas de type trouvé. L'historique est vide."
+
+#~ msgid ""
+#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
+#~ msgstr ""
+#~ "Impossible d’annuler la commande « {0} » parce que la couche « {1} » n’est "
+#~ "plus présente"
+
+#~ msgid "Parameter ''{0}'' must not be empty"
+#~ msgstr "Le paramètre ''{0}'' ne doit pas être vide."
 
 #~ msgid "Please restart JOSM."
@@ -31523,2 +32139,19 @@
 #~ "L'ensemble de changements actuel est vide. Impossible d'envoyer les "
 #~ "données."
+
+#~ msgid "Id > 0 required, got {0}"
+#~ msgstr "requis : Id > 0 obtenu : {0}"
+
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "le paramètre \"{0}\" ne doit pas être nul."
+
+#~ msgid ""
+#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
+#~ "This can lead to nodes being deleted accidentally.\n"
+#~ "Are you really sure to continue?"
+#~ msgstr ""
+#~ "Le(s) chemin(s) sélectionné(s) contien(nen)t des nœuds en dehors de la "
+#~ "zone téléchargée.\n"
+#~ "Certains nœuds utilisés en dehors de la zone pourraient être supprimés "
+#~ "accidentellement.\n"
+#~ "Voulez-vous vraiment continuer ?"
Index: applications/editors/josm/i18n/po/gl.po
===================================================================
--- applications/editors/josm/i18n/po/gl.po	(revision 19689)
+++ applications/editors/josm/i18n/po/gl.po	(revision 19698)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-19 00:01-0500\n"
-"PO-Revision-Date: 2010-01-17 02:57-0500\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-23 22:22+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\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-01-13 18:29+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -70,11 +70,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -235,5 +235,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -247,13 +247,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -262,5 +262,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -286,5 +289,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr ""
@@ -313,5 +316,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -378,9 +381,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -388,5 +391,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "OK"
@@ -437,6 +442,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -454,5 +459,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -461,11 +466,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -502,5 +507,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "conflito"
@@ -635,14 +640,14 @@
 msgstr "Por favor, selecciona polo menos dúas vías para combinar."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Copiar os obxectos seleccionados ó buffer de pegado."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Por favor, selecciona algo para copiar"
@@ -673,8 +678,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -683,5 +688,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -739,16 +744,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Houbo conflitos durante a importación."
-msgstr[1] "Houbo conflitos durante a importación."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "Erros durante a descarga"
-msgstr[1] "Erros durante a descarga"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -769,4 +773,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -776,4 +782,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplicar selección copiando e pegando inmediatamente."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Duplicar"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "Mover os membros actualmente seleccionados cara arriba"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "Capa: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "Facer zoom a {0}"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr ""
 
 #. <button label="Info" hotkey="I">
@@ -864,10 +898,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 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] "A via seleccionada non contén o nodo seleccionado."
-msgstr[1] "A vía seleccionada non contén todos os nodos seleccionados."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -986,5 +1019,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr ""
@@ -1134,5 +1167,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr ""
 
@@ -1146,9 +1179,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Abrir un ficheiro."
-msgstr[1] "Abrir un ficheiro."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1204,7 +1237,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1218,5 +1251,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "Mover os nodos de xeito que todos os ángulos teñan 90 ou 270 grados"
 
@@ -1252,4 +1286,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+msgid "Selection must consist only of ways and nodes."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
 msgid "Orthogonalize"
@@ -1264,4 +1302,15 @@
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr "Por favor, selecciona vías con ángulos case rectos para ortogonalizar."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1369,18 +1418,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1405,12 +1454,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Erro"
@@ -1546,5 +1596,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1793,5 +1843,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr ""
@@ -1812,7 +1862,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:77
-#, fuzzy, java-format
+#, java-format
 msgid "Did not find an object with id {0} in the current dataset"
-msgstr "Non se atopou unha primitiva coa id {0} en este paquete de datos"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:85
@@ -2210,6 +2260,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2330,5 +2380,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Buscar obxectos."
@@ -2516,5 +2566,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Buscar"
@@ -2554,25 +2604,22 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "CS"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
-msgstr "CI"
+msgstr ""
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
-msgstr "RX"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2586,9 +2633,9 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2725,9 +2772,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "Cambiar {0} obxecto"
-msgstr[1] "Cambiar {0} obxectos"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2777,12 +2824,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "Eliminar \"{0}\" para {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Establecer {0}={1} para {2} {3}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2840,17 +2887,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Borrar Modo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Borrar Capa"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Borrar da relación"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2931,9 +2978,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "Cambiar {0} obxecto"
-msgstr[1] "Cambiar {0} obxectos"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -2983,24 +3030,24 @@
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "Undelete {0} primitive"
 msgid_plural "Undelete {0} primitives"
-msgstr[0] "Desfacer o borrado de {0} primitivas"
-msgstr[1] "Desfacer o borrado de {0} primitivas"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for node {0}"
-msgstr "Resolver conflitos en coordenadas en {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for way {0}"
-msgstr "Resolver conflitos en coordenadas en {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Resolver conflitos na lista de membros da relación {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3247,5 +3294,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3253,5 +3300,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3259,5 +3306,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3265,5 +3312,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3342,15 +3389,13 @@
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "CS"
+msgstr ""
 
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
-#, fuzzy
 msgctxt "filter"
 msgid "I"
-msgstr "CI"
+msgstr ""
 
 #. column header: filter mode
@@ -3363,8 +3408,7 @@
 #. filter mode: replace
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210
-#, fuzzy
 msgctxt "filter"
 msgid "R"
-msgstr "RX"
+msgstr ""
 
 #. filter mode: add
@@ -3386,19 +3430,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3407,5 +3451,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3413,5 +3457,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3534,6 +3578,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3543,5 +3587,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3552,7 +3596,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3574,5 +3618,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "fondo"
@@ -3716,6 +3760,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3723,37 +3767,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "incompleto"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "Carretera"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "Vía férrea"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "Vía acuática"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3762,10 +3807,10 @@
 msgstr[1] "{0} nodos"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3774,5 +3819,5 @@
 msgstr[1] "{0} membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3809,6 +3854,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Conflito"
@@ -3819,5 +3864,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-msgid "Authorization Failed"
+msgid "Authorisation Failed"
 msgstr ""
 
@@ -4020,5 +4065,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Inicializando"
@@ -4059,5 +4103,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4068,5 +4112,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Edición"
@@ -4137,29 +4181,29 @@
 msgstr "escalar"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 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:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 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:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 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:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 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:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 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:106
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 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:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4167,9 +4211,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(sen obxecto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4332,9 +4376,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "conflito"
-msgstr[1] "conflito"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
@@ -4396,16 +4440,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4601,8 +4645,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr "Acoplar nodos no máis antigo"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4628,5 +4676,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional node used by way {1}<br>which is deleted on the "
@@ -4636,9 +4684,5 @@
 "server.<br><br>Do you want to undelete these nodes too?"
 msgstr[0] ""
-"Hai {0} nodos adicionais usados pola vía {1}<br>que están borrados no "
-"servidor.<br><br>Quere desfacer o borrado de eses nodos tamén?"
 msgstr[1] ""
-"Hai {0} nodos adicionais usados pola vía {1}<br>que están borrados no "
-"servidor.<br><br>Quere desfacer o borrado de eses nodos tamén?"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
@@ -4647,5 +4691,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional primitive referred to by relation {1}<br>which is "
@@ -4655,9 +4699,5 @@
 "deleted on the server.<br><br>Do you want to undelete these too?"
 msgstr[0] ""
-"<html>Hai {0} nodos adicionais usados pola vía {1}<br>que están borrados no "
-"servidor.<br><br>Quere desfacer o borrado de eses nodos tamén?</html>"
 msgstr[1] ""
-"<html>Hai {0} nodos adicionais usados pola vía {1}<br>que están borrados no "
-"servidor.<br><br>Quere desfacer o borrado de eses nodos tamén?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
@@ -4758,5 +4798,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr ""
@@ -4802,5 +4842,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -4930,10 +4975,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr ""
@@ -4963,7 +5008,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-#, fuzzy, java-format
+#, java-format
 msgid "Tag collection does not include the selected value ''{0}''."
-msgstr "A via seleccionada non contén o nodo seleccionado."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
@@ -5013,7 +5058,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -5023,6 +5068,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5202,10 +5247,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5225,13 +5270,13 @@
 msgstr "Pila de Comandos: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Resolver"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
@@ -5239,6 +5284,6 @@
 "superior."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5271,5 +5316,5 @@
 "<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.Click <strong>{0}</strong> to close anyway."
+"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.</"
@@ -5295,5 +5340,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5302,5 +5347,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5381,43 +5426,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Capas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 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:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Amosar/Ocultar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Duplicar"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 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:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Mover a capa seleccionada unha fila cara abaixo."
@@ -5431,6 +5481,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Relacións"
@@ -5440,69 +5490,69 @@
 msgstr "Abrir unha lista con todas as relacións."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relacións: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Abrir un editor para a relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Borrar a relación seleccionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Crear unha nova relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Selección Actual"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Abrir unha ventá de lista de selección."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Facer zoom sobre o(s) elemento(s) seleccionado(s)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Facer zoom sobre a selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sel.: Rel.:{0} / Vías:{1} / Nodos:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5510,5 +5560,5 @@
 msgstr "Selección"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5862,8 +5912,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -5935,4 +5983,7 @@
 #. <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 />
@@ -6011,6 +6062,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6052,6 +6104,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6520,152 +6574,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Nome"
@@ -7048,5 +7104,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<diferente>"
@@ -7102,55 +7158,55 @@
 msgstr "Engadir Propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Cambiar relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "Borrar da relación"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Borrar realmente a selección da relación {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Borrar a clave seleccionada en todos os obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "Borrar Propiedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Engadir un novo par clave/valor para todos os obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editar o valor da clave seleccionada para todos os obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7592,47 +7648,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Marcadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../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:187
+#: ../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:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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:212
+#: ../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:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr ""
@@ -7670,7 +7725,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
-#, fuzzy, java-format
+#, java-format
 msgid "The string ''{0}'' is not a valid double value."
-msgstr "o parámetro \"{0}\" non é un nome de tipo válido, obtivose \"{1}\""
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
@@ -7758,18 +7813,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -7780,34 +7835,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
 msgid "Enter a place name to search for:"
 msgstr "Introduce o nome do lugar a buscar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+#: ../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:147
+#: ../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:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Excepción de punteiro nulo, posiblemente faltan algunhas etiquetas."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr ""
@@ -7818,7 +7873,9 @@
 #. 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" />
@@ -7827,10 +7884,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr ""
@@ -7839,5 +7897,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -7849,17 +7907,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "descoñecido"
@@ -8212,5 +8269,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr ""
@@ -8656,9 +8713,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8668,7 +8725,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -8680,16 +8737,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr ""
@@ -9102,68 +9159,68 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "punto gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Personalizar debuxo de liñas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../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:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
 msgid "Select line drawing options"
 msgstr "Seleccionar as opcións de liña do debuxo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Personalizar Cor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Escolle unha cor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Importar Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9173,23 +9230,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Ficheiros Wave Audio (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcas de audio de {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Importar imaxes"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9199,5 +9256,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9205,5 +9262,5 @@
 msgstr "Nome: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9211,5 +9268,5 @@
 msgstr "Descrición: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9219,23 +9276,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Lonxitude: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9244,5 +9301,5 @@
 msgstr[1] "{0} rutas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9251,10 +9308,10 @@
 msgstr[1] "{0} puntos de vía"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Convertir en capa de datos"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9264,43 +9321,43 @@
 "perxudicial.<br>Se desexas subir trazados, mira aqui:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Convertido de: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Descargar todo o que abarca:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "Área máxima por petición:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km cad."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9311,9 +9368,9 @@
 "Desexas<br>continuar?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 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:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9321,5 +9378,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9329,23 +9386,23 @@
 "correctamente os seus tempos foron omitidos."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Capa de datos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "fora da área descargada"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9354,5 +9411,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9366,5 +9423,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9377,11 +9434,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9390,32 +9447,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} composto de:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Convertir a capa GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9462,28 +9519,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "Puntos GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Ficheiros GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, 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:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Erro durante a análise {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Non se puido ler \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9492,34 +9548,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9527,64 +9583,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9594,45 +9650,45 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9641,5 +9697,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9647,41 +9703,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 msgid "The selected photos do not contain time information."
-msgstr "A via seleccionada non contén o nodo seleccionado."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
 "one."
-msgstr "A via seleccionada non contén o nodo seleccionado."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9690,5 +9744,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9697,63 +9751,63 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "Ler fotos..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Lendo {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, 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:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, 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:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Imaxes xeo-etiquetadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "Non se cargaron datos."
-msgstr[1] "Non se cargaron datos."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -9762,10 +9816,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -9774,5 +9828,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -9869,5 +9923,5 @@
 msgstr "marca gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -9875,5 +9929,5 @@
 msgstr[1] "marcas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -9882,9 +9936,9 @@
 msgstr[1] "{0} componse de {1} marcas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "Sincronizar Audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -9892,20 +9946,20 @@
 "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:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr "Audio sincronizado no punto {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -9913,17 +9967,17 @@
 msgstr "Debes ter pausado o audio no punto da pista onde queres a marca."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Amosar/Ocultar Texto/Iconas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 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:171
+#: ../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 "
@@ -9931,5 +9985,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -9937,5 +9991,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "Non se puido crear unha nova marca de audio."
@@ -9961,5 +10015,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
 #, java-format
 msgid ""
@@ -9967,5 +10021,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
 #, java-format
 msgid ""
@@ -10017,7 +10071,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
 msgid "Authorize URL:"
-msgstr "Autor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10107,7 +10160,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
 msgid "Authorize now"
-msgstr "Autor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10245,7 +10297,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
 msgid "Please select an authorization procedure: "
-msgstr "Por favor, selecciona polo menos catro nodos."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10568,5 +10619,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Por favor selecciona a fila a editar."
@@ -10580,5 +10631,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10733,9 +10784,4 @@
 msgstr "Estilo de pintura {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "Capa: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -10765,6 +10811,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr "Todo"
@@ -10803,8 +10849,8 @@
 msgstr "Color simple (pode ser personalizado para as capas con nome)"
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Coche"
@@ -10826,13 +10872,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Bicicleta"
@@ -10865,12 +10911,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "Pé"
@@ -11229,5 +11275,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
-#, fuzzy
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11243,15 +11288,4 @@
 "keyboard...</p>"
 msgstr ""
-"<p>Poida que notes que a lista de selección de teclas da páxina seguinte "
-"contén todas as teclas que existen en todos os tipos de teclado que coñece "
-"JAVA, non só aquelas que contén o teu teclado. Por favor, usa so aqueles "
-"valores que corresponden cunha tecla real do teu teclado. Polo que, se o teu "
-"teclado non ten a tecla \"Copy\" (os teclados dos PC non a teñen, pero os de "
-"SUN si), non a uses. Ademais aparecerán teclas que correspondan cun atallo "
-"no teu teclado (p.e. ':'/Dous puntos). Por favor, tampouco as uses, usa no "
-"seu lugar a tecla base (';'/Punto e coma nos teclados norteamericanos, '.'/"
-"Punto nos teclados españois,...). Non facelo así pode causar conflitos dado "
-"que JOSM non ten forma de saber que 'Ctrl+Maiús+.' e 'Ctrl+:' son realmente "
-"a mesma cousa nun teclado español...</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
@@ -11873,5 +11907,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -11879,18 +11920,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "Atributos Opcionais:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr "vía pechada"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo descoñecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -11901,16 +11942,16 @@
 msgstr "Non se puido ler a fonte de etiquetado preestablecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Erro analizando {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, 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:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -11919,18 +11960,17 @@
 msgstr[1] "Cambiar {0} obxectos"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "Nada seleccionado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "Selección non axeitada!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "Aplicar axuste preestablecido"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Cambiar Propiedades"
@@ -12206,6 +12246,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12230,9 +12270,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Erro de análise: estrutura de documento non válida para documento gpx"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12255,7 +12295,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
@@ -12327,5 +12373,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "Coordenadas importadas: "
@@ -12426,9 +12472,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Cambiar {0} obxecto"
-msgstr[1] "Cambiar {0} obxectos"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -13056,5 +13102,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -13062,6 +13108,6 @@
 "Plugin {0} requires {1} plugins which were not found. The missing plugins "
 "are:"
-msgstr[0] "O engadido {0} foi requerida polo engadido {1} pero non se atopou."
-msgstr[1] "O engadido {0} foi requerida polo engadido {1} pero non se atopou."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13326,5 +13372,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13332,9 +13377,4 @@
 "file a bug report."
 msgstr ""
-"Ocurriu unha excepción inesperada\n"
-"\n"
-"Isto é sempre un erro de código. Se estas a usar a última\n"
-"versión de JOSM, por favor considera ser tan amable  de abrir un informe de "
-"erro."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13429,6 +13469,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -13545,6 +13585,6 @@
 "Non se puido atopar traducción para a localización {0}. Volvendo a {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13553,5 +13593,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -13692,4 +13732,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr ""
@@ -13780,5 +13821,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr ""
@@ -14359,5 +14400,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr ""
@@ -14516,21 +14557,21 @@
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr ""
@@ -14562,9 +14603,9 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -14579,13 +14620,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr ""
@@ -14594,6 +14635,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr ""
@@ -14819,17 +14860,17 @@
 msgstr "Cargar conxunto de imaxes como unha nova capa"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../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:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -14873,42 +14914,41 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr ""
@@ -14964,6 +15004,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -14972,73 +15012,73 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../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:43
+#: ../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:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../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:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../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:55
+#: ../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:57
+#: ../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:59
+#: ../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:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../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:67
+#: ../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:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -15046,5 +15086,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -15052,5 +15092,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -15058,58 +15098,58 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../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:79
+#: ../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:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../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:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr ""
@@ -15133,5 +15173,5 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr ""
@@ -15162,5 +15202,5 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr ""
@@ -15234,5 +15274,5 @@
 msgstr ""
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr ""
@@ -15489,4 +15529,74 @@
 #: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:135
 msgid "Firefox executable"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+msgid "Read error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Introducir as coordenadas para o novo nodo."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Conservar ficheiros de copia de seguridade"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Erro"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "A hora introducida non puido ser analizada."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Renomear tamén o ficheiro"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Conservar ficheiros de copia de seguridade"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "Conservar ficheiros de copia de seguridade"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Sobrescribir"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+msgid "Could not delete temporary file!"
 msgstr ""
 
@@ -15760,6 +15870,6 @@
 msgstr "Gardar os datos capturados a un ficheiro cada minuto."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -15881,72 +15991,126 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+msgid "Terrace a house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+#, fuzzy
+msgid "Interpolation"
+msgstr "Información"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Seleccionar"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+msgid "Highest Number"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+msgid "Lowest Number"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+msgid "Lowest housenumber of the terraced house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Crear unha nova relación"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Borrar nodos ou vías."
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Ordenar o menú de elementos preestablecidos"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../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:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr ""
@@ -16178,5 +16342,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr ""
@@ -16186,5 +16350,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16196,9 +16360,9 @@
 "estar usandoos.<br>Queres borralos realmente?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr ""
@@ -16233,5 +16397,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr ""
@@ -16378,7 +16542,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -16386,80 +16550,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16467,87 +16631,87 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "Borrar da lista a fonte seleccionada."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr "Usar ficheiro de datos por defecto."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr "Usar o ficheiro de datos por defecto (recomendado)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr "Usar ficheiro de comprobación ortográfica predeterminado."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 "Usar o ficheiro de comprobación ortográfica predeterminado (recomendado)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -16987,5 +17151,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -16996,63 +17160,63 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+msgid "Download visible tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
-msgid "Download visible tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "Gardar capa WMS nun ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "Cargar capa WMS dende ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, 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:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr "Erro de Formato de Ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "Erro cargando ficheiro"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -17303,6 +17467,13 @@
 msgstr ""
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17311,15 +17482,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17328,10 +17499,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17340,15 +17511,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17358,10 +17529,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17370,5 +17541,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17377,10 +17548,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -17487,6 +17658,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -17494,6 +17674,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr ""
@@ -17510,5 +17691,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr ""
@@ -17530,10 +17711,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -17577,14 +17758,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr ""
@@ -17627,13 +17808,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -17671,13 +17852,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr ""
@@ -17712,13 +17893,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr ""
@@ -17753,13 +17934,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr ""
@@ -17890,4 +18071,13 @@
 #: build/trans_presets.java:225
 msgid "Edit Unclassified Road"
+msgstr ""
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
 msgstr ""
 
@@ -17906,15 +18096,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr ""
@@ -17926,5 +18116,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr ""
@@ -17933,5 +18123,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr ""
@@ -17949,16 +18139,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr ""
@@ -17980,166 +18173,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr ""
@@ -18147,5 +18347,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr ""
@@ -18154,5 +18354,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr ""
@@ -18160,5 +18360,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr ""
@@ -18167,5 +18367,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr ""
@@ -18173,5 +18373,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr ""
@@ -18180,5 +18380,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr ""
@@ -18188,18 +18388,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr ""
@@ -18207,5 +18407,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr ""
@@ -18215,5 +18415,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -18221,5 +18421,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -18228,5 +18428,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -18235,20 +18435,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -18256,9 +18456,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 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"
@@ -18269,6 +18470,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18280,4 +18479,5 @@
 #. 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"
@@ -18296,141 +18496,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr ""
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr ""
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr ""
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr ""
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr ""
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr ""
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -18445,10 +18653,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr ""
@@ -18464,10 +18672,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr ""
@@ -18482,27 +18690,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr ""
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr ""
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr ""
@@ -18510,25 +18710,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr ""
@@ -18539,5 +18739,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr ""
@@ -18557,10 +18757,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr ""
@@ -18582,10 +18782,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr ""
@@ -18607,10 +18807,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr ""
@@ -18632,5 +18832,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -18645,9 +18845,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr ""
@@ -18661,9 +18861,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr ""
@@ -18693,10 +18893,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr ""
@@ -18726,5 +18926,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -18736,10 +18936,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr ""
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr ""
@@ -18747,19 +18947,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr ""
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr ""
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr ""
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr ""
@@ -18775,5 +18975,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr ""
@@ -18781,5 +18981,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr ""
@@ -18788,35 +18988,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "tipo"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -18824,5 +19023,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -18830,26 +19029,26 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
 msgstr ""
@@ -18857,5 +19056,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr ""
@@ -18864,6 +19063,27 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
+msgstr ""
+
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
 msgstr ""
 
@@ -18930,11 +19150,10 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "Combinar de todas formas"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr ""
@@ -18943,10 +19162,9 @@
 #. <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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr ""
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr ""
@@ -18954,5 +19172,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr ""
@@ -18962,5 +19180,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr ""
@@ -18968,10 +19186,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr ""
@@ -18979,15 +19197,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr ""
@@ -18995,5 +19213,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr ""
@@ -19001,5 +19219,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -19032,17 +19251,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr ""
@@ -19051,5 +19270,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr ""
@@ -19059,5 +19278,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -19066,27 +19285,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr ""
@@ -19094,6 +19313,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr ""
@@ -19102,11 +19321,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -19114,30 +19333,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr ""
@@ -19145,5 +19364,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -19152,14 +19371,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr ""
@@ -19170,14 +19435,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr ""
@@ -19187,26 +19452,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr ""
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr ""
@@ -19214,5 +19481,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr ""
@@ -19220,5 +19487,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr ""
@@ -19226,11 +19493,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr ""
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr ""
@@ -19238,5 +19512,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr ""
@@ -19244,5 +19518,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -19254,7 +19528,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr ""
@@ -19262,5 +19536,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr ""
@@ -19268,5 +19542,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr ""
@@ -19274,5 +19548,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr ""
@@ -19317,16 +19591,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr ""
@@ -19335,5 +19609,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr ""
@@ -19341,5 +19615,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr ""
@@ -19347,10 +19621,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr ""
@@ -19358,15 +19632,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr ""
@@ -19374,5 +19648,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr ""
@@ -19380,10 +19654,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr ""
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr ""
@@ -19393,5 +19667,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr ""
@@ -19400,12 +19674,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
-msgid "Fence"
-msgstr ""
-
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#: build/trans_presets.java:817 build/trans_presets.java:819
+msgid "Fence"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr ""
@@ -19413,5 +19699,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr ""
@@ -19420,5 +19706,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr ""
@@ -19430,15 +19716,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr ""
@@ -19446,50 +19733,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr ""
@@ -19497,25 +19784,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr ""
@@ -19526,11 +19813,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr ""
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr ""
@@ -19538,5 +19825,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr ""
@@ -19544,5 +19831,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr ""
@@ -19550,10 +19837,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr ""
@@ -19561,10 +19859,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr ""
@@ -19572,10 +19870,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr ""
@@ -19585,5 +19883,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr ""
@@ -19591,15 +19889,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr ""
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr ""
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr ""
@@ -19607,15 +19905,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr ""
@@ -19623,15 +19921,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -19639,5 +19937,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr ""
@@ -19646,10 +19944,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr ""
@@ -19660,14 +19958,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr ""
@@ -19681,35 +19979,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr ""
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr ""
@@ -19717,20 +20015,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr ""
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr ""
@@ -19738,10 +20036,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr ""
@@ -19749,5 +20047,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr ""
@@ -19755,5 +20053,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr ""
@@ -19761,5 +20059,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr ""
@@ -19768,5 +20066,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr ""
@@ -19774,10 +20072,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr ""
@@ -19785,5 +20083,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr ""
@@ -19791,5 +20089,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr ""
@@ -19797,15 +20095,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr ""
@@ -19814,5 +20112,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr ""
@@ -19820,20 +20118,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr ""
@@ -19842,15 +20140,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr ""
@@ -19858,10 +20156,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr ""
@@ -19869,10 +20167,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr ""
@@ -19882,20 +20180,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr ""
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr ""
@@ -19903,5 +20201,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr ""
@@ -19910,139 +20208,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr ""
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr ""
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr ""
+
+#. item "Man Made/Power Line" text "Line reference"
+#. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
+#: build/trans_presets.java:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr ""
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr ""
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr ""
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr ""
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr ""
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr ""
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr ""
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr ""
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr ""
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr ""
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr ""
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr ""
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr ""
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr ""
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr ""
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr ""
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr ""
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr ""
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr ""
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr ""
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr ""
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr ""
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr ""
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr ""
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr ""
@@ -20051,5 +20588,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr ""
@@ -20058,5 +20595,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr ""
@@ -20066,5 +20603,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr ""
@@ -20072,5 +20609,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr ""
@@ -20079,10 +20616,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr ""
@@ -20090,10 +20634,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr ""
@@ -20101,10 +20645,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr ""
@@ -20112,10 +20656,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr ""
@@ -20123,10 +20667,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20134,12 +20678,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr ""
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr ""
@@ -20149,9 +20706,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr ""
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20205,32 +20819,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr ""
@@ -20289,94 +20903,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20388,5 +21078,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20396,5 +21086,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr ""
@@ -20405,25 +21095,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr ""
@@ -20432,48 +21122,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr ""
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr ""
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr ""
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr ""
@@ -20481,5 +21171,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr ""
@@ -20488,10 +21178,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr ""
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr ""
@@ -20499,5 +21189,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr ""
@@ -20505,10 +21195,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr ""
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr ""
@@ -20517,15 +21207,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr ""
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr ""
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -20535,5 +21225,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -20541,5 +21231,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr ""
@@ -20547,5 +21237,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr ""
@@ -20553,5 +21243,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr ""
@@ -20559,5 +21249,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr ""
@@ -20566,5 +21256,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr ""
@@ -20572,5 +21262,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr ""
@@ -20579,5 +21269,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr ""
@@ -20589,5 +21279,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr ""
@@ -20595,10 +21285,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr ""
@@ -20607,10 +21297,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr ""
@@ -20619,5 +21309,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr ""
@@ -20626,5 +21316,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr ""
@@ -20632,5 +21322,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr ""
@@ -20640,5 +21330,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr ""
@@ -20647,25 +21337,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr ""
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr ""
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr ""
@@ -20673,5 +21364,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr ""
@@ -20679,5 +21370,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr ""
@@ -20685,32 +21376,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr ""
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr ""
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr ""
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr ""
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr ""
@@ -20722,5 +21508,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -20729,15 +21515,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr ""
@@ -20745,20 +21531,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr ""
@@ -20766,10 +21552,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr ""
@@ -20777,30 +21563,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr ""
@@ -20808,10 +21594,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr ""
@@ -20822,5 +21608,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
@@ -20828,5 +21614,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr ""
@@ -20834,5 +21620,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr ""
@@ -20840,61 +21626,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr ""
@@ -20902,9 +21700,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr ""
@@ -20912,9 +21718,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr ""
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr ""
@@ -20922,18 +21728,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr ""
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr ""
@@ -20941,9 +21747,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr ""
@@ -20951,24 +21757,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr ""
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr ""
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr ""
@@ -20976,9 +21782,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr ""
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr ""
@@ -20987,9 +21793,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr ""
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr ""
@@ -20997,24 +21803,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr ""
@@ -21022,5 +21828,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr ""
@@ -21028,19 +21834,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr ""
@@ -21078,5 +21884,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -21084,28 +21890,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr ""
@@ -21115,5 +21921,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr ""
@@ -21121,5 +21927,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr ""
@@ -21127,6 +21933,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr ""
@@ -21134,5 +21940,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr ""
@@ -21140,6 +21946,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr ""
@@ -21147,5 +21953,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr ""
@@ -21153,46 +21959,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr ""
@@ -21200,29 +22006,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr ""
@@ -21230,25 +22036,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr ""
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr ""
@@ -21257,19 +22063,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr ""
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr ""
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr ""
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr ""
@@ -21278,9 +22084,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr ""
@@ -21288,10 +22094,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr ""
@@ -21299,5 +22105,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -21305,15 +22111,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr ""
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr ""
@@ -21321,55 +22127,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr ""
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr ""
@@ -21377,35 +22183,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr ""
@@ -21419,6 +22225,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr ""
@@ -21810,6 +22616,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -21843,225 +22649,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr ""
@@ -22100,21 +22906,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "tipo"
@@ -22153,203 +22959,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr ""
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr ""
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr ""
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr ""
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr ""
@@ -22357,56 +23163,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr ""
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr ""
@@ -22414,182 +23216,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr ""
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr ""
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr ""
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr ""
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr ""
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr ""
@@ -22597,5 +23399,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr ""
@@ -22603,10 +23405,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr ""
@@ -22614,10 +23416,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr ""
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr ""
@@ -22625,10 +23427,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr ""
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr ""
@@ -22637,10 +23439,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr ""
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr ""
@@ -22649,10 +23451,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr ""
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr ""
@@ -22662,10 +23464,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr ""
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr ""
@@ -22674,10 +23476,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr ""
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr ""
@@ -22685,5 +23487,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr ""
@@ -22691,15 +23493,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr ""
@@ -22707,10 +23509,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr ""
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr ""
@@ -22718,10 +23520,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr ""
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr ""
@@ -22729,5 +23531,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr ""
@@ -22735,5 +23537,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr ""
@@ -22742,10 +23544,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr ""
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr ""
@@ -22754,9 +23556,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr ""
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr ""
@@ -22764,10 +23566,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr ""
@@ -22776,10 +23578,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr ""
@@ -22789,5 +23591,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr ""
@@ -22796,6 +23598,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr ""
@@ -22804,66 +23606,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr ""
@@ -22872,81 +23674,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr ""
@@ -22955,5 +23757,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr ""
@@ -22961,5 +23763,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr ""
@@ -22967,25 +23769,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr ""
@@ -22994,5 +23796,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -23000,61 +23802,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr ""
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr ""
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr ""
@@ -23062,25 +23864,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr ""
@@ -23088,10 +23890,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr ""
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr ""
@@ -23099,10 +23901,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr ""
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr ""
@@ -23111,37 +23913,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr ""
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
+msgid "gas"
+msgstr ""
+
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr ""
+
+#: build/trans_presets.java:2353
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-msgid "gas"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr ""
@@ -23151,10 +23953,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr ""
@@ -23162,21 +23964,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
-msgstr ""
-
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr ""
@@ -23184,10 +23981,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr ""
@@ -23195,11 +23992,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr ""
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr ""
@@ -23209,35 +24018,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr ""
@@ -23246,10 +24055,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr ""
@@ -23258,5 +24067,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -23264,10 +24073,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr ""
@@ -23278,23 +24087,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr ""
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr ""
@@ -23303,79 +24112,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr ""
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr ""
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr ""
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr ""
@@ -23384,5 +24188,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr ""
@@ -23390,5 +24194,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr ""
@@ -23396,5 +24200,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr ""
@@ -23402,5 +24206,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -23408,5 +24212,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr ""
@@ -23414,15 +24218,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr ""
@@ -23431,5 +24235,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr ""
@@ -23437,31 +24241,42 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+msgid "Edit Waste Basket"
 msgstr ""
 
@@ -23469,31 +24284,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr ""
@@ -23572,5 +24387,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -23580,31 +24395,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -23613,30 +24428,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr ""
@@ -23645,10 +24460,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr ""
@@ -23657,10 +24472,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr ""
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr ""
@@ -23668,15 +24496,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr ""
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr ""
@@ -23684,10 +24512,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr ""
@@ -23696,28 +24524,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr ""
@@ -23725,9 +24553,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr ""
@@ -23735,27 +24563,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr ""
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr ""
@@ -23763,5 +24591,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr ""
@@ -23769,88 +24597,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr ""
@@ -23858,9 +24686,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr ""
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr ""
@@ -23868,9 +24696,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr ""
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr ""
@@ -23878,18 +24706,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr ""
@@ -23897,54 +24725,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr ""
@@ -23952,9 +24780,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr ""
@@ -23962,9 +24790,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -23972,54 +24800,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr ""
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr ""
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr ""
@@ -24027,9 +24855,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr ""
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr ""
@@ -24037,9 +24865,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr ""
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr ""
@@ -24047,28 +24875,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr ""
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr ""
@@ -24076,14 +24904,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr ""
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr ""
@@ -24091,5 +24919,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr ""
@@ -24097,15 +24925,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr ""
@@ -24113,18 +24941,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr ""
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr ""
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr ""
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr ""
@@ -24132,5 +24960,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr ""
@@ -24138,9 +24966,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr ""
@@ -24148,10 +24976,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr ""
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr ""
@@ -24160,5 +24988,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -24167,20 +24995,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -24188,5 +25016,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr ""
@@ -24195,64 +25023,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr ""
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Lugares"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr ""
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr ""
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr ""
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr ""
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr ""
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr ""
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr ""
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr ""
@@ -24260,15 +25088,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr ""
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr ""
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr ""
@@ -24276,10 +25104,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr ""
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr ""
@@ -24287,25 +25115,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr ""
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr ""
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr ""
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr ""
@@ -24313,5 +25141,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr ""
@@ -24319,10 +25147,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr ""
@@ -24330,10 +25158,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr ""
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr ""
@@ -24341,5 +25169,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr ""
@@ -24347,5 +25175,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr ""
@@ -24353,10 +25181,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr ""
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr ""
@@ -24364,10 +25192,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr ""
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr ""
@@ -24375,10 +25203,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr ""
@@ -24386,70 +25214,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr ""
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr ""
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr ""
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr ""
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr ""
@@ -24458,15 +25286,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr ""
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr ""
@@ -24475,5 +25303,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr ""
@@ -24481,17 +25309,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr ""
@@ -24500,14 +25328,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr ""
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -24515,25 +25343,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr ""
@@ -24541,10 +25369,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr ""
@@ -24552,5 +25380,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr ""
@@ -24558,5 +25386,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr ""
@@ -24565,45 +25393,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr ""
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -24611,25 +25439,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr ""
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr ""
@@ -24637,10 +25465,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr ""
@@ -24648,20 +25476,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr ""
@@ -24669,5 +25497,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -24675,15 +25503,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr ""
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr ""
@@ -24691,9 +25519,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr ""
@@ -24701,39 +25529,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr ""
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr ""
@@ -24741,15 +25569,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr ""
@@ -24757,50 +25585,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr ""
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr ""
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr ""
@@ -24810,5 +25638,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr ""
@@ -24817,10 +25645,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr ""
@@ -24828,5 +25656,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr ""
@@ -24835,5 +25663,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -24841,34 +25669,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr ""
@@ -24877,15 +25705,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr ""
@@ -24893,5 +25721,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr ""
@@ -24900,5 +25728,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr ""
@@ -24906,5 +25734,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr ""
@@ -24995,5 +25823,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -25003,17 +25831,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr ""
@@ -25073,5 +25901,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -25080,9 +25908,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr ""
@@ -25096,10 +25924,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr ""
@@ -25107,31 +25935,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr ""
@@ -25140,106 +25968,31 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 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 ""
 
@@ -25775,77 +26528,4 @@
 #: build/trans_style.java:975 build/trans_style.java:983
 msgid "highway_track"
-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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
 msgstr ""
 
@@ -29372,21 +30052,4 @@
 msgstr ""
 
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "o parámetro \"{0}\" debe non ser nulo"
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "o parámetro \"{0}\" non é unha clase aceptable, obtivose \"{1}\""
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr "esperábase o parámetro \"{0}\" no rango 0..{1}, obtívose {2}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "Requírese o parámetro {0} > 0. Obtívose {1}."
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "imaxe"
-#~ msgstr[1] "imaxes"
-
 #~ msgid "Do not show again"
 #~ msgstr "Non amosar de novo"
@@ -29506,4 +30169,9 @@
 #~ msgstr "Diferencia de zona horaria: "
 
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "imaxe"
+#~ msgstr[1] "imaxes"
+
 #~ msgid "{0} within the track."
 #~ msgstr "{0} dentro da traza."
@@ -29523,7 +30191,4 @@
 #~ msgid "Synchronize Time with GPS Unit"
 #~ msgstr "Sincronizar hora coa da unidade GPS"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "A hora introducida non puido ser analizada."
 
 #~ msgid "The base URL for the OSM server (REST API)"
@@ -29790,8 +30455,4 @@
 #~ msgstr "So se permiten dous nodos"
 
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr ""
-#~ "Por favor, selecciona vías con ángulos case rectos para ortogonalizar."
-
 #~ msgid "Only one node selected"
 #~ msgstr "Só hai un nodo seleccionado"
@@ -29910,7 +30571,4 @@
 #~ msgid "Data upload failed for unknown reason"
 #~ msgstr "A subida de datos fallou por causa descoñecida"
-
-#~ msgid "Public"
-#~ msgstr "Público"
 
 #~ msgid "Open images with AgPifoJ..."
@@ -30026,7 +30684,16 @@
 #~ "\"{1}\">galego</A>."
 
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "o parámetro \"{0}\" debe non ser nulo"
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "valor retornado non esperado. Obtívose {0}"
 
+#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "Requírese o parámetro {0} > 0. Obtívose {1}."
+
+#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
+#~ msgstr "o parámetro \"{0}\" non é unha clase aceptable, obtivose \"{1}\""
+
 #~ msgid "There's no primitive with version {0} in this history."
 #~ msgstr "Non hai unha primitiva coa versión {0} en este historial"
@@ -30035,4 +30702,7 @@
 #~ msgstr "Non hai unha versión válida con data \"{0}\" en este historial"
 
+#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
+#~ msgstr "esperábase o parámetro \"{0}\" no rango 0..{1}, obtívose {2}"
+
 #~ msgid "No earliest version found. History is empty."
 #~ msgstr "non se atopou unha versión anterior. O historial está valeiro."
Index: applications/editors/josm/i18n/po/he.po
===================================================================
--- applications/editors/josm/i18n/po/he.po	(revision 19689)
+++ applications/editors/josm/i18n/po/he.po	(revision 19698)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-19 00:01-0500\n"
-"PO-Revision-Date: 2010-01-17 23:02-0500\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-23 21:36+0000\n"
 "Last-Translator: Tsvi Mostovicz <ttmost@gmail.com>\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-01-13 18:29+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -70,11 +70,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -239,5 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -251,13 +251,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -266,5 +266,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -290,5 +293,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "מזג"
@@ -317,5 +320,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -382,9 +385,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -392,5 +395,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "אישור"
@@ -441,6 +446,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -458,5 +463,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -465,11 +470,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -506,5 +511,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "התנגשות"
@@ -635,14 +640,14 @@
 msgstr "נא בחר לפחות שתי דרכים לשילוב."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "העתק"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "העתק את הפריטים הנבחרים אל חוצץ ההדבקה."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "אנא בחר דבר מה להעתקה."
@@ -674,8 +679,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -684,5 +689,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -739,16 +744,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "נמצאו {0} התנגשויות במהלך היבוא"
-msgstr[1] "נמצאו {0} התנגשויות במהלך היבוא"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "התנגשות במהלך ההורדה"
-msgstr[1] "התנגשות במהלך ההורדה"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -769,4 +773,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -776,4 +782,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "שכפל את הבחירה על ידי העתקה והדבקה מיידית."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "שכפל דרך"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+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:142
+#, java-format
+msgid "Layer: {0}"
+msgstr ""
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, 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 ""
 
 #. <button label="Info" hotkey="I">
@@ -864,10 +898,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 msgid "The selected way has nodes outside of the downloaded data region."
 msgid_plural ""
 "The selected ways have nodes outside of the downloaded data region."
-msgstr[0] "הדרך הבחורה אינה מכילה את הנקודה הבחורה."
-msgstr[1] "הדרך הבחורה אינה מכילה את הנקודות הבחורות."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -986,5 +1019,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "כתובת"
@@ -1134,5 +1167,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr ""
 
@@ -1146,9 +1179,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "פותח קבצים"
-msgstr[1] "פותח קבצים"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1204,7 +1237,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1218,5 +1251,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "הזז נקודות כך שכל הזוויות יהיו בנות 90 או 270 מעלות"
 
@@ -1252,4 +1286,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+msgid "Selection must consist only of ways and nodes."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
 msgid "Orthogonalize"
@@ -1264,4 +1302,15 @@
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr "בחר דרכים עם זווית כמעט ישרה ליישור"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1367,18 +1416,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1403,12 +1452,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "שגיאה"
@@ -1541,5 +1591,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1774,5 +1824,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr ""
@@ -2190,6 +2240,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2264,7 +2314,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
-#, fuzzy
 msgid "<not>"
-msgstr "צפון"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
@@ -2306,5 +2355,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "חיפוש אחר פריטים."
@@ -2488,5 +2537,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "חפש"
@@ -2526,25 +2575,22 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "CS"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
-msgstr "CI"
+msgstr ""
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
-msgstr "RX"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2557,9 +2603,9 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2692,9 +2738,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "שנה עצם {0}"
-msgstr[1] "שנה {0} עצמים"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2744,12 +2790,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "הסר \"{0}\" מ-{1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "קבע {0}={1} עבור {2} {3}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2807,17 +2853,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "מצב מחיקה"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "מחק שכבה"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "מחק מיחס"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2897,9 +2943,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "שנה עצם {0}"
-msgstr[1] "שנה {0} עצמים"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -2954,17 +3000,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for node {0}"
-msgstr "פתור התנגשויות בקואורדינטות ב-{0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for way {0}"
-msgstr "פתור התנגשויות בקואורדינטות ב-{0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "פתור התנגשויות בקואורדינטות ב-{0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3209,5 +3255,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3215,5 +3261,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3221,5 +3267,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3227,5 +3273,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3304,15 +3350,13 @@
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "CS"
+msgstr ""
 
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
-#, fuzzy
 msgctxt "filter"
 msgid "I"
-msgstr "CI"
+msgstr ""
 
 #. column header: filter mode
@@ -3325,8 +3369,7 @@
 #. filter mode: replace
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210
-#, fuzzy
 msgctxt "filter"
 msgid "R"
-msgstr "RX"
+msgstr ""
 
 #. filter mode: add
@@ -3348,19 +3391,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3369,5 +3412,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3375,5 +3418,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3451,7 +3494,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:327
-#, fuzzy
 msgid "The \"to\" way does not start or end at a \"via\" node."
-msgstr "הדרך הבחורה אינה מכילה את הנקודה הבחורה."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
@@ -3497,6 +3539,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3506,5 +3548,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3515,7 +3557,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3537,5 +3579,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "רקע"
@@ -3679,6 +3721,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3686,37 +3728,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "לא גמור"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "כביש ראשי"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "מסילת רכבת"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "נתיב מים"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3725,10 +3768,10 @@
 msgstr[1] "{0} נקודות"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3737,5 +3780,5 @@
 msgstr[1] "{0} חברים"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3772,6 +3815,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "התנגשות"
@@ -3782,7 +3825,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-#, fuzzy
-msgid "Authorization Failed"
-msgstr "ההתחברות נכשלה."
+msgid "Authorisation Failed"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
@@ -3985,5 +4027,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "מאתחל"
@@ -4024,5 +4065,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4033,5 +4074,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "ערוך"
@@ -4102,29 +4143,29 @@
 msgstr "הגדלה"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "קו האורך הגיאוגרפי בסמן העכבר."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The name of the object at the mouse pointer."
 msgstr "שם העצם בסמן העכבר."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "קו הרוחב הגיאוגרפי בסמן העכבר."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The angle between the previous and the current way segment."
 msgstr "הזווית בין קטע הדרך הקודם לנוכחי"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "כיוון (המצפן) של קטע הדרך מצויר."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 msgid "The length of the new way segment being drawn."
 msgstr "אורך קטע הדרך החדש מצויר."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4132,9 +4173,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(אין עצם)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4294,9 +4335,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "התנגשות"
-msgstr[1] "התנגשות"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
@@ -4358,16 +4399,16 @@
 msgstr "פתרון התנגשות"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4571,8 +4612,12 @@
 msgstr "נקודה"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr "מזג את הצמתים לישנים ביותר."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4720,5 +4765,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr ""
@@ -4764,5 +4809,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -4892,10 +4942,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "כלום"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "הכל"
@@ -4925,7 +4975,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-#, fuzzy, java-format
+#, java-format
 msgid "Tag collection does not include the selected value ''{0}''."
-msgstr "הדרך הבחורה אינה מכילה את הנקודה הבחורה."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
@@ -4975,7 +5025,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -4985,6 +5035,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5164,10 +5214,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5187,18 +5237,18 @@
 msgstr "מצבור פקודות: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "פתור"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr "פתח את תיבת דו-שיח עבור כל הפריטים הנבחרים ברשימה שלהלן."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5231,5 +5281,5 @@
 "<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.Click <strong>{0}</strong> to close anyway."
+"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.</"
@@ -5255,5 +5305,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5262,5 +5312,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5340,43 +5390,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "שכבות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 msgid "Open a list of all loaded layers."
 msgstr "פתח רשימה המכילה את כל השכבות שנטענו."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "הצג/הסתר"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "שכפל דרך"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 msgid "Move the selected layer one row up."
 msgstr "העבר את השכבה הנבחרת שורה אחת מעלה."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "העבר את השכבה הנוכחית שורה אחת מטה."
@@ -5390,6 +5445,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "יחסים"
@@ -5399,69 +5454,69 @@
 msgstr "פתח רשימה של כל היחסים."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "יחסים: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "פתח עורך עבור היחס הנבחר"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "מחק את היחס הנבחר"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "צור יחס חדש"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "הבחירה הנוכחית"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "פתח חלון רשימת בחירה."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "התאם מיקוד לאלמנט\\ים הבחור\\ים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "התאם מיקוד לבחירה"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "בחר: יחסים:{0} \\ דרכים: {1} \\ נקודות: {2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5469,5 +5524,5 @@
 msgstr "בחירה"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5818,8 +5873,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -5891,4 +5944,7 @@
 #. <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 />
@@ -5967,6 +6023,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6008,6 +6065,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6476,152 +6535,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "שם"
@@ -7004,5 +7065,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<שונה>"
@@ -7057,55 +7118,55 @@
 msgstr "הוסף תכונות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "תכונות: {0} \\ חברויות: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "תכונות \\ חברויות"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "שנה יחס"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "מחק מיחס"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "באמת מחק את הבחירה מהיחס {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "מחק את המפתח הנבחר בכל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "מחק מאפיינים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "הוסף מצד מפתח/ערך לכל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "ערוך את הערך של המפתח הנבחר עבור כל הפריטים"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7432,7 +7493,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
-#, fuzzy
 msgid "Do you really want to apply the new role?"
-msgstr "האם אתה רוצה לאשר את זה?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
@@ -7548,47 +7608,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "סימניות"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../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:187
+#: ../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:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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:212
+#: ../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:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr ""
@@ -7710,18 +7769,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -7732,34 +7791,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../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:111
+#: ../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:147
+#: ../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:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr ""
@@ -7770,7 +7829,9 @@
 #. 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" />
@@ -7779,10 +7840,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "סוג"
@@ -7791,5 +7853,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -7801,17 +7863,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "לא ידוע"
@@ -8156,5 +8217,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr ""
@@ -8595,9 +8656,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8607,7 +8668,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -8619,16 +8680,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "שכבה"
@@ -9041,68 +9102,68 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "נקודת gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "התאם ציור קו"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Use global settings."
 msgstr "השתמש בהגדרות הגלובליות."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "התאם צבעים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "ברירת מחדל"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "בחר צבע"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr "סמנים מנקודות בעלות שם"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "ייבא שמע"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9112,23 +9173,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "קובץ שמע (wav.*)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "סמן שמע מ {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "ייבא תמונות"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9138,5 +9199,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9144,5 +9205,5 @@
 msgstr "שם: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9150,5 +9211,5 @@
 msgstr "תיאור: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9158,23 +9219,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "תיאור"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "אורך: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9183,5 +9244,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9190,10 +9251,10 @@
 msgstr[1] "{0} נקודות דרך"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "המר לשכבת נתונים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9203,43 +9264,43 @@
 "מסלולים, ראה כאן:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "המר מ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "הורד הכל עם:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} מטרים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "שטח מירבי לבקשה"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} קמ\"ר"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9250,9 +9311,9 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9260,5 +9321,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9268,23 +9329,23 @@
 "באופן הגיוני הושמטו."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "שכבת נתונים {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "מחוץ לשטח שהורד"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr "גירסה {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9293,5 +9354,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9305,5 +9366,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9316,11 +9377,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9329,32 +9390,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} מורכב מ-:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr "גירסת API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "המר לשכבת GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9401,28 +9462,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "נקודות GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "קבצי GPX‏ (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "שגיאה בעת ניתוח {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "לא ניתן לקרוא את \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9431,34 +9491,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr "זמן צילום (מ-EXIF)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 msgid "Gps time (read from the above photo): "
 msgstr "זמן GPS (נקרא מהצילום למעלה): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr "אני באזור זמן: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "אין תאריך"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr "פתח תמונה אחרת"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9466,64 +9526,64 @@
 msgstr "שגיאה בזמן ניתוח התאריך:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "תאריך שגוי"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr "אזור זמן: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr "היסט:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9533,45 +9593,45 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr "אזור זמן שגוי"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr "היסט שגוי"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9580,5 +9640,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9586,41 +9646,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 msgid "The selected photos do not contain time information."
-msgstr "הדרך הבחורה אינה מכילה את הנקודה הבחורה."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
 "one."
-msgstr "הדרך הבחורה אינה מכילה את הנקודה הבחורה."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9631,5 +9689,5 @@
 "פורמט מצופה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9640,63 +9698,63 @@
 "פורמט מצופה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "מחלץ מיקומי GPS מ-EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr "מתחיל סריקת ספרייה"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "קורא תמונות..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "קורא {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, 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:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "קורא ספרייה {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "נמצא קובץ null בתיקייה {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "שגיאה בזמן קבלת קבצים מהסיפריה {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "תמונות בעלות גאותגיות"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "שום נתונים לא נטענו."
-msgstr[1] "שום נתונים לא נטענו."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -9705,10 +9763,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -9717,5 +9775,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -9812,5 +9870,5 @@
 msgstr "סמן gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -9818,5 +9876,5 @@
 msgstr[1] "סמנים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -9825,29 +9883,29 @@
 msgstr[1] "{0} מורכב מ-{1} סמנים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "סנכרן שמע"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 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:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -9855,17 +9913,17 @@
 msgstr "אתה צריך לעצור את השמע בנקודה על המסלול שבה אתה רוצה את הסמן."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "הצג\\הסתר טקסט\\סמלים"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
+#: ../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 "
@@ -9873,5 +9931,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -9879,5 +9937,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "לא יכול ליצור סמן שמע חדש."
@@ -9903,5 +9961,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
 #, java-format
 msgid ""
@@ -9909,5 +9967,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
 #, java-format
 msgid ""
@@ -9959,7 +10017,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
 msgid "Authorize URL:"
-msgstr "מחבר"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10049,7 +10106,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
 msgid "Authorize now"
-msgstr "מחבר"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10108,7 +10164,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
-#, fuzzy
 msgid "OAuth authorization failed"
-msgstr "ההתחברות נכשלה."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
@@ -10188,7 +10243,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
 msgid "Please select an authorization procedure: "
-msgstr "נא בחר לפחות ארבעה צמתים."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10510,5 +10564,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "נא בחר את השורה לעריכה."
@@ -10522,5 +10576,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10657,9 +10711,4 @@
 msgstr "סגנון ציור {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -10689,6 +10738,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr ""
@@ -10727,8 +10776,8 @@
 msgstr ""
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "רכב"
@@ -10750,13 +10799,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "אופניים"
@@ -10789,12 +10838,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "רגל"
@@ -11748,5 +11797,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -11754,18 +11810,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "מאפייני רשות:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "סוג לא ידוע: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -11776,16 +11832,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "שגיאה בניתוח {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -11794,18 +11850,17 @@
 msgstr[1] "שנה {0} עצמים"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "כלום לא נבחר!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "שנה תכונות"
@@ -12079,6 +12134,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12103,9 +12158,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "שגיאת ניתוח. למסמך gpx מבנה לא תקין."
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12121,7 +12176,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
-#, fuzzy
 msgid "Looking for image files"
-msgstr "מחפש קו חוף..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
@@ -12129,7 +12183,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
@@ -12201,5 +12261,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr ""
@@ -12300,9 +12360,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "שנה עצם {0}"
-msgstr[1] "שנה {0} עצמים"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -12928,5 +12988,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -12934,6 +12994,6 @@
 "Plugin {0} requires {1} plugins which were not found. The missing plugins "
 "are:"
-msgstr[0] "התוסף {0} דרוש ע\"י התוסף {1} אך אינו נמצא."
-msgstr[1] "התוסף {0} דרוש ע\"י התוסף {1} אך אינו נמצא."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13195,5 +13255,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13201,8 +13260,4 @@
 "file a bug report."
 msgstr ""
-"אירעה שגיאה בלתי צפויה\n"
-"\n"
-"זוהי תמיד בעית קידוד. אם אתה מריץ את הגירסא\n"
-"האחרונה של JOSM, היה נחמד ודווח על התקלה."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13294,6 +13349,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -13409,6 +13464,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13417,5 +13472,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -13563,4 +13618,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr ""
@@ -13651,5 +13707,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr ""
@@ -14228,5 +14284,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr "מיקום"
@@ -14383,21 +14439,21 @@
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr ""
@@ -14429,9 +14485,9 @@
 msgstr "ייצר דרך משוכפלת"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -14446,13 +14502,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr "ייבא נתיב משכבת GPX"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr "זנח נתיב קיים"
@@ -14461,6 +14517,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr "לא נמצאה שכבת נתוני GPX"
@@ -14686,17 +14742,17 @@
 msgstr "פתח סט תמונות כשכבה חדשה."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr "המיקום ההתחלתי נמצא מחוץ לתחום"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../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:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -14740,42 +14796,41 @@
 msgstr "מוריד נקודות כפולות..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "מזרח"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "צפון-מזרח"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "צפון"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "צפון-מערב"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "מערב"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "דרום-מערב"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "דרום"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "דרום-מזרח"
@@ -14831,6 +14886,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -14839,73 +14894,73 @@
 msgstr "מים"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "קו חוף"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "אדמה"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../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:43
+#: ../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:45
+#: ../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:47
+#: ../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:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../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:55
+#: ../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:57
+#: ../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:59
+#: ../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:61
+#: ../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:63
+#: ../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:65
+#: ../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:67
+#: ../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:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14914,5 +14969,5 @@
 "מספר מירבי של נקודות לייצור לפני חילוץ (לפני פישוט קווים). ברירת מחדל 50000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -14920,5 +14975,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14928,58 +14983,58 @@
 "נקודות, וקווים מדוייקים יותר. ברירת מחדל 0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../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:77
+#: ../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:78
+#: ../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:79
+#: ../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:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../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:82
+#: ../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:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr "הגודל המירבי לכל ספריית מטמון בבייטים. ברירת המחדל היא 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../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:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr "לא יכול להשיג תמונה"
@@ -15003,5 +15058,5 @@
 msgstr "ההתחברות נכשלה"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr ""
@@ -15032,5 +15087,5 @@
 msgstr "כיוון"
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr "שכבת LiveGPS"
@@ -15104,5 +15159,5 @@
 msgstr "זווית בין שתי נקודות בחורות"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr "שכבה לעריכת מדידות."
@@ -15361,4 +15416,75 @@
 msgid "Firefox executable"
 msgstr "קובץ הרצת פיירפוקס"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+msgid "Read error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "הכנס את הקורדינטות של הנקודה החדשה."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "שמור קובצי גיבוי"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "שגיאה"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "לא ניתן לנתח את הזמן שהוזן."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "לא ניתן לשנות את שם הקובץ ''{0}''"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "שמור קובצי גיבוי"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "שמור קובצי גיבוי"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "שכתוב"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+#, fuzzy
+msgid "Could not delete temporary file!"
+msgstr "לא יכול למצוא את סוג האלמנט"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
@@ -15633,6 +15759,6 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -15754,72 +15880,129 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+#, fuzzy
+msgid "Terrace a house"
+msgstr "מדרג"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+#, fuzzy
+msgid "Interpolation"
+msgstr "מידע"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "רחובות"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "מספרי משטחים"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "מספר נקודה"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+msgid "Lowest housenumber of the terraced house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "צור יחס חדש"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "ייצר דרך משוכפלת"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "שם רחוב"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../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:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr "מדרג"
@@ -16053,5 +16236,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr "נקודות כפולות"
@@ -16061,5 +16244,5 @@
 msgstr "מבחן זה בודק אם אין נקודות שנמצאות בדיוק באותו מקום."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16070,9 +16253,9 @@
 "אחרים {שאתה לא רואה) עשויים להשתמש בהם.<br>האם אתה באמת רוצה למחוק?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr ""
@@ -16107,5 +16290,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr ""
@@ -16252,7 +16435,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr "צירופי תווית \\ ערך לא חוקיים"
@@ -16260,80 +16443,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr "בעיית ציור"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "מפתח \"{0}\" לא תקין."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr "תוויות עם ערכים ריקים"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr "מפתח תכונה לא תקין"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr "רווח לא תקין במפתח תכונה"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr "ערכי תכונות מתחילים או מסתיימים ברווח"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr "בדוק מפתחות תכונות."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16341,86 +16524,86 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr "הוסף מקור חדש לרשימה"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr "ערוך את המקור הנבחר"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "מחק את המקור הנבחר מהרשימה"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "מקורות נתונים"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr "בדוק ערכי תכונות."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr "השתמש בברירת המחדל לקובץ הנתונים (מומלץ)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr "השתמש בברירת המחדל לקובץ בודק האיות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr "תקן תכונות"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr "לא יכול למצוא את סוג האלמנט"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr "לא יכול למצוא את דרגת האזהרה"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "ביטוי לא חוקי \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -16860,5 +17043,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -16869,63 +17052,63 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
-msgid ""
-"The requested area is too big. Please zoom in a little, or change resolution"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
 msgid "Download visible tiles"
 msgstr "הורד משטחים גלויים"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+msgid ""
+"The requested area is too big. Please zoom in a little, or change resolution"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "שנה רזולוציה"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr "טען מחדש משטחים פגומים"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "שמור שכבת WMS לקובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "טען שכבת WMS מקובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "גירסת קובץ WMS לא נתמכת; נמצא {0}, צפי {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr "שגיאה בפורמט קובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "שגיאה בטעינת קובץ"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -17178,6 +17361,13 @@
 msgstr ""
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17186,15 +17376,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17203,10 +17393,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17215,15 +17405,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17233,10 +17423,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17245,5 +17435,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17252,10 +17442,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -17362,6 +17552,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -17369,6 +17568,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "התייחסות"
@@ -17385,5 +17585,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "מסלולים"
@@ -17405,10 +17605,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "מהירות מירבית (קמ\"ש)"
@@ -17452,14 +17652,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "חד סטרי"
@@ -17502,13 +17702,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -17546,13 +17746,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "מנהרה"
@@ -17587,13 +17787,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr ""
@@ -17628,13 +17828,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr ""
@@ -17766,4 +17966,13 @@
 msgid "Edit Unclassified Road"
 msgstr "ערוך כביש לא מסווג"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr ""
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -17781,15 +17990,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr ""
@@ -17801,5 +18010,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "מגורים"
@@ -17808,5 +18017,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "ערוך רחוב מגורים"
@@ -17824,16 +18033,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "שטח פנים"
@@ -17855,166 +18067,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr "סלול"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr "לא סלול"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr "אבני ריצוף"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "חצץ"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "דשא"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "חול"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr "אדמה"
@@ -18022,5 +18241,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr ""
@@ -18029,5 +18248,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr ""
@@ -18035,5 +18254,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "הולכי רגל"
@@ -18042,5 +18261,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "ערוך רחוב להולכי רגל"
@@ -18048,5 +18267,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr "שירות"
@@ -18055,5 +18274,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr "ערוך דרך שירות"
@@ -18063,18 +18282,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr ""
@@ -18082,5 +18301,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr "מפרץ חנייה"
@@ -18090,5 +18309,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr "ערוך מפרץ חנייה"
@@ -18096,5 +18315,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "כביש (סוג לא ידוע)"
@@ -18103,5 +18322,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "ערוך כביש מסוג לא ידוע"
@@ -18110,20 +18329,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "הגבלות דרך"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "ערוך הגבלות דרך"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "אגרה"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "דרך ללא מוצא"
@@ -18131,9 +18350,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 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"
@@ -18144,6 +18364,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18155,4 +18373,5 @@
 #. 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"
@@ -18171,141 +18390,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "פרטי"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr ""
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr "חקלאי"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "פרטי"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "יעד"
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr ""
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr "חקלאי"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "לא"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -18320,10 +18547,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr "סוס"
@@ -18339,10 +18566,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "אופנוע"
@@ -18357,27 +18584,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr "רכב ציבורי"
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr "סירת מנוע"
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "סירה"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "מהירות מינימלית (קמ\"ש)"
@@ -18385,25 +18604,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "משקל מירבי (טונות)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "כיכר"
@@ -18414,5 +18633,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "ערוך צומת"
@@ -18432,10 +18651,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr ""
@@ -18457,10 +18676,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr ""
@@ -18482,10 +18701,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "ראשי"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr ""
@@ -18507,5 +18726,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -18520,9 +18739,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "שלישוני"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr ""
@@ -18536,9 +18755,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "מגורים"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr ""
@@ -18568,10 +18787,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "שירות"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr ""
@@ -18601,5 +18820,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -18611,10 +18830,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "ערוך גשר"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr ""
@@ -18622,19 +18841,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "דרכים"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "בנייה"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "ערוך דרך מהירה בבנייה"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "צומת"
@@ -18650,5 +18869,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "כיכר"
@@ -18656,5 +18875,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr ""
@@ -18663,40 +18882,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "מדרג"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "חצץ"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "חצץ"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "חצץ"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "חצץ"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "חצץ"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr ""
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -18704,5 +18917,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -18710,37 +18923,32 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "צעידה הררית"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
-msgstr "צעידה הררית מאומצת"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
-msgstr "צעידה אלפינית"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
-msgstr "צעידה אלפינית מאומצת"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
-msgstr "צעידה אלפינית קשה"
+msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "נתיב"
@@ -18749,7 +18957,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "ערוך נתיב"
+
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
 
 #: build/trans_presets.java:489
@@ -18769,7 +18998,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "ערוך גשר"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -18782,7 +19010,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "ערוך שביל אופניים"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -18817,24 +19044,21 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "אחד בכל זאת"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "ערוך שביל להולכי רגל"
+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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "ערוך שביל להולכי רגל"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr ""
@@ -18842,5 +19066,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "מדרגות"
@@ -18850,5 +19074,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "ערוך גרם מדרגות"
@@ -18856,10 +19080,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr "ציון דרך"
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr ""
@@ -18867,15 +19091,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "מספר"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "שירותים"
@@ -18883,5 +19107,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr "ערוך תחנת שירות"
@@ -18889,5 +19113,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -18920,17 +19145,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "מפעיל"
@@ -18939,5 +19164,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "רמזור"
@@ -18947,5 +19172,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr "סוג מעבר חציה"
@@ -18954,27 +19179,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "אי"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr ""
@@ -18982,6 +19207,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr ""
@@ -18990,11 +19215,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -19002,30 +19227,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr "זברה"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr "שקנאי"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "עצור"
@@ -19033,5 +19258,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr "מעבר חציה"
@@ -19040,14 +19265,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr ""
@@ -19058,14 +19329,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr ""
@@ -19075,26 +19346,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "תחום עיר"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "ערוך שלט תחום עיר"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr "שם שני"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "טלפון חירום"
@@ -19102,5 +19375,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr ""
@@ -19108,5 +19381,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr ""
@@ -19114,11 +19387,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr "אזור צליחה"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr "ערוך אזור צליחה"
@@ -19126,5 +19406,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr "מעבר הרים"
@@ -19132,5 +19412,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr "ערוך מעבר הרים"
@@ -19142,7 +19422,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "הגבהה"
@@ -19150,5 +19430,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "מחסומים"
@@ -19156,5 +19436,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr ""
@@ -19162,5 +19442,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr ""
@@ -19205,16 +19485,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "תנועה מותרת:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr ""
@@ -19223,5 +19503,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr "מחסום"
@@ -19229,5 +19509,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr ""
@@ -19235,10 +19515,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr ""
@@ -19246,15 +19526,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr "דוקרנים"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr "ערוך דוקרנים"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "תא אגרה"
@@ -19262,5 +19542,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "ערוך תא אגרה"
@@ -19268,10 +19548,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr "ביקורת גבולות"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr "ערוך ביקורת גבולות"
@@ -19281,5 +19561,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr ""
@@ -19288,12 +19568,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
-msgid "Fence"
-msgstr ""
-
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#: build/trans_presets.java:817 build/trans_presets.java:819
+msgid "Fence"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "חומה"
@@ -19301,5 +19593,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "חומת עיר"
@@ -19308,5 +19600,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr ""
@@ -19318,15 +19610,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr "כניסה"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr "ערוך כניסה"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "שער"
@@ -19334,50 +19627,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr "ערוך שער"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr ""
@@ -19385,25 +19678,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr ""
@@ -19414,11 +19707,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "מים"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "מעיין"
@@ -19426,5 +19719,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "ערוך מעיין"
@@ -19432,5 +19725,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr ""
@@ -19438,10 +19731,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "נחל"
@@ -19449,10 +19753,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "ערוך נחל"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "תעלה"
@@ -19460,10 +19764,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "ערוך תעלה"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "נהר"
@@ -19473,5 +19777,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "ערוך נהר"
@@ -19479,15 +19783,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "ערוך מים"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "אדמה"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "ערוך אדמה"
@@ -19495,15 +19799,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr ""
@@ -19511,15 +19815,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -19527,5 +19831,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "גדת נחל"
@@ -19534,10 +19838,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "ערוך גדת נחל"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr ""
@@ -19548,14 +19852,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "ביצה"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr "אדמה בוצית"
@@ -19569,35 +19873,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr "ביצה"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr "מצע קנה-סוף"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr "ביצה מלוחה"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr "מנגרוב"
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "בוץ"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr "ערוך בוץ"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "חוף"
@@ -19605,20 +19909,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "ערוך חוף"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "מפרץ"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "ערוך מפרץ"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "צוק"
@@ -19626,10 +19930,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "ערוך צוק"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "קו חוף"
@@ -19637,5 +19941,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "ערוך קו חוף"
@@ -19643,5 +19947,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "נתיב מעבורת"
@@ -19649,5 +19953,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr "ערוך מעבורת"
@@ -19656,5 +19960,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr "מספנה"
@@ -19662,10 +19966,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr "ערוך מספנה"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr ""
@@ -19673,5 +19977,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr ""
@@ -19679,5 +19983,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr ""
@@ -19685,15 +19989,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr ""
@@ -19702,5 +20006,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr ""
@@ -19708,20 +20012,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr ""
@@ -19730,15 +20034,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr ""
@@ -19746,10 +20050,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr ""
@@ -19757,10 +20061,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr ""
@@ -19770,20 +20074,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr ""
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr ""
@@ -19791,5 +20095,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr ""
@@ -19798,139 +20102,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr "סטנדרטי"
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr ""
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr ""
+
+#. item "Man Made/Power Line" text "Line reference"
+#. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
+#: build/trans_presets.java:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr ""
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr ""
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr ""
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr "רכבת קלה"
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr "ערוך רכבת קלה"
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "רכבת תחתית"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "ערוך רכבת תחתית"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr ""
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr ""
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr ""
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr ""
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr ""
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr ""
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr ""
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr ""
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr ""
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr ""
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr ""
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr "רכבת קלה"
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr "ערוך רכבת קלה"
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "רכבת תחתית"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "ערוך רכבת תחתית"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr ""
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr ""
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr ""
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr ""
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr ""
@@ -19939,5 +20482,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr ""
@@ -19946,5 +20489,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr ""
@@ -19954,5 +20497,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr ""
@@ -19960,5 +20503,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr ""
@@ -19967,10 +20510,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr ""
@@ -19978,10 +20528,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr ""
@@ -19989,10 +20539,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr ""
@@ -20000,10 +20550,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr ""
@@ -20011,10 +20561,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20022,12 +20572,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr ""
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "דלק"
@@ -20037,9 +20600,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "ערוך דלק"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20093,32 +20713,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "שעות פתיחה"
@@ -20177,94 +20797,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20276,5 +20972,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20284,5 +20980,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr ""
@@ -20293,25 +20989,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr ""
@@ -20320,48 +21016,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "שטיפה"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "ערוך שטיפת רכב"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "תיקונים"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "ערוך תיקוני רכבים"
@@ -20369,5 +21065,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "השכרה"
@@ -20376,10 +21072,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "ערוך השכרת רכב"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr "שיתוף"
@@ -20387,5 +21083,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr "ערוך שיתוף רכבים"
@@ -20393,10 +21089,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr ""
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr ""
@@ -20405,15 +21101,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "ערוך השכרת אופניים"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "תחבורה ציבורית"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -20423,5 +21119,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -20429,5 +21125,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr ""
@@ -20435,5 +21131,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr ""
@@ -20441,5 +21137,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr ""
@@ -20447,5 +21143,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr ""
@@ -20454,5 +21150,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr ""
@@ -20460,5 +21156,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr ""
@@ -20467,5 +21163,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr ""
@@ -20477,5 +21173,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr ""
@@ -20483,10 +21179,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "כניסת רכבת תחתית"
@@ -20495,10 +21191,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "ערוך כניסת רכבת תחתית"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr ""
@@ -20507,5 +21203,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "תחנת אוטובוס"
@@ -20514,5 +21210,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "ערוך תחנת אוטובוס"
@@ -20520,5 +21216,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr ""
@@ -20528,5 +21224,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr ""
@@ -20535,25 +21231,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr "מקלט"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "ספסל"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr ""
@@ -20561,5 +21258,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "מונית"
@@ -20567,5 +21264,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "ערוך תחנת מוניות"
@@ -20573,32 +21270,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "שדה תעופה"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr "ערוך שדה תעופה"
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr ""
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr ""
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "לינה"
@@ -20610,5 +21402,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "מלון"
@@ -20617,15 +21409,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr ""
@@ -20633,20 +21425,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr ""
@@ -20654,10 +21446,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr ""
@@ -20665,30 +21457,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr ""
@@ -20696,10 +21488,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "מזון ושתיה"
@@ -20710,5 +21502,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "מסעדה"
@@ -20716,5 +21508,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr ""
@@ -20722,5 +21514,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr ""
@@ -20728,61 +21520,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr "קבב"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "תורכי"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "אסייתי"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "תאילנדי"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "מקסיקני"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "יפני"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "מזון מהיר"
@@ -20790,9 +21594,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "ערוך מסעדת מזון מהיר"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "בית קפה"
@@ -20800,9 +21612,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "ערוך בית קפה"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "פאב"
@@ -20810,18 +21622,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "ערוך פאב"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr "בר"
@@ -20829,9 +21641,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr "ערוך בר"
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "מועדון לילה"
@@ -20839,24 +21651,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "ערוך מועדון לילה"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "תיירות"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "מוזיאון"
@@ -20864,9 +21676,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "ערוך מוזיאון"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "גן חיות"
@@ -20875,9 +21687,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "ערוך גן חיות"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "נקודת תצפית"
@@ -20885,24 +21697,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "ערוך נקודת תצפית"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr "מגדל תצפית"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "פארק שעשועים"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr "ערוך פארק שעשועים"
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "יצירת אומנות"
@@ -20910,5 +21722,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "ערוך יצירת אומנות"
@@ -20916,19 +21728,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "מפה"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr ""
@@ -20966,5 +21778,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -20972,28 +21784,28 @@
 msgstr "רחוב"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr ""
@@ -21003,5 +21815,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr ""
@@ -21009,5 +21821,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr "צעידה"
@@ -21015,6 +21827,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "רכיבה"
@@ -21022,5 +21834,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr ""
@@ -21028,6 +21840,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "סקי"
@@ -21035,5 +21847,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr ""
@@ -21041,46 +21853,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "היסטוריה"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr "טבע"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr ""
@@ -21088,29 +21900,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr "ערוך מקלט"
@@ -21118,25 +21930,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "אתר פיקניק"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "ערוך אתר פיקניק"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "מקומות היסטורים"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "טירה"
@@ -21145,19 +21957,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "ערוך טירה"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "חורבות"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "ערוך חורבות"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "אתר ארכיאולוגי"
@@ -21166,9 +21978,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "ערוך אתר ארכיאולוגי"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "שדה קרב"
@@ -21176,10 +21988,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "ערוך שדה קרב"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr ""
@@ -21187,5 +21999,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -21193,15 +22005,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "אנדרטה"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "ערוך אנדרטה"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "מצבת זיכרון"
@@ -21209,55 +22021,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "ערוך מצבת זיכרון"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "פנאי"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "פארק מים"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "ערוך פארק מים"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "מגרש משחקים"
@@ -21265,35 +22077,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "ערוך מגרש משחקים"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "דייג"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "ערוך דייג"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr "מתקני ספורט"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "איצטדיון"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "ערוך איצטדיון"
@@ -21307,6 +22119,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "בחר ענף ספורט:"
@@ -21698,6 +22510,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -21731,225 +22543,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "קשתות"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr "אתלטיקה"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "כדורגל אוסטרלי"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "כדור בסיס"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "כדורסל"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr "כדורת דשא"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr "קנו"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "טיפוס"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr "קריקט"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr "מירוץ כלבים"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "כדורגל אמריקאי"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "גולף"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "התעמלות"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "הוקי"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr "מירוץ סוסים"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr "רוגבי"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr "סקייטבורד"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr "סקייטים"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "סקי"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "כדורגל"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "שחייה"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "טניס שולחן"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "טניס"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "מרכז ספורט"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "ערוך מרכז ספורט"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr "מסלול מירוצים"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr "ערוך מסלול מירוצים"
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "מגרש גולף"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "ערוך מגרש גולף"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "מיני-גולף"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "ערוך מיני-גולף"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "ספורט"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr ""
@@ -21988,21 +22800,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "סוג"
@@ -22041,203 +22853,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "מרכז ספורט"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "איצטדיון"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr "אתלטיקה"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr "ערוך אתלטיקה"
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "קשתות"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "ערוך קשתות"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "טיפוס"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "ערוך טיפוס"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr "ערוך רכיבה"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "מירוץ כלבים"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr "ערוך מירוץ כלבים"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr "מירוץ סוסים"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr "ערוך מירוץ סוסים"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "התעמלות"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr "ערוך התעמלות"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "ספורט מוטורי"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr "ערוך ספורט מוטורי"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr "סקייטבורד"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr "ערוך סקייטבורד"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "שחייה"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "ערוך שחייה"
@@ -22245,56 +23057,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr "ערוך סקי"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr "סוג מסלול"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr "גלישה במורד"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr "פארק שלג"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr "קושי"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr "מתחילים"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr "קל"
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr ""
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr "מקצוענים"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "ירי"
@@ -22302,182 +23110,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "ערוך ירי"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "ספורט (משחקי כדור)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "כדורגל"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr "ערוך כדורגל"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "כדורגל אמריקאי"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr "ערוך כדורגל אמריקאי"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr "כדורגל אוסטרלי"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr "ערוך כדורגל אוסטרלי"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "כדור בסיס"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr "ערוך כדור בסיס"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "כדורסל"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "ערוך כדורסל"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "גולף"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr "ערוך גולף"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "מגרש גולף"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr "כדורת דשא"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr "ערוך כדורת דשא"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "הוקי"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "ערוך הוקי"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "רוגבי"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr "ערוך רוגבי"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "טניס שולחן"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "ערוך טניס שולחן"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "טניס"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "ערוך טניס"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "מבנים"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "מבנה"
@@ -22485,5 +23293,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "מבנה ציבור"
@@ -22491,10 +23299,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "ערוך מבנה ציבור"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "בניין העירייה"
@@ -22502,10 +23310,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "ערוך בניין העירייה"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "שגרירות"
@@ -22513,10 +23321,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "ערוך שגרירות"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "בית משפט"
@@ -22525,10 +23333,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "ערוך בית משפט"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "כלא"
@@ -22537,10 +23345,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "ערוך כלא"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "משטרה"
@@ -22550,10 +23358,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "ערוך משטרה"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "תחנת מכבי אש"
@@ -22562,10 +23370,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "ערוך תחנת מכבי אש"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "דואר"
@@ -22573,5 +23381,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "ערוך דואר"
@@ -22579,15 +23387,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "גן ילדים"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "ערוך גן ילדים"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "בית ספר"
@@ -22595,10 +23403,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "ערוך בית ספר"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "אוניברסיטה"
@@ -22606,10 +23414,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "ערוך אוניברסיטה"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "מכללה"
@@ -22617,5 +23425,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "ערוך מכללה"
@@ -22623,5 +23431,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "קולנוע"
@@ -22630,10 +23438,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "ערוך קולנוע"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "ספרייה"
@@ -22642,9 +23450,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "ערוך ספרייה"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "מרכז אומנויות"
@@ -22652,10 +23460,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "ערוך מרכז אומנויות"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "תיאטרון"
@@ -22664,10 +23472,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "ערוך תיאטרון"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "מקום תפילה"
@@ -22677,5 +23485,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "ערוך מקום תפילה"
@@ -22684,6 +23492,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "דת"
@@ -22692,66 +23500,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr "בהאי"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "בודהיסט"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "נוצרי"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "הינדי"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "יהודי"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "מוסלמי"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr "סיקי"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr "ספיריטואליסט"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr "טאואיסט"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr ""
@@ -22760,81 +23568,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr "אנגליקני"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "באפטיסט"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "קתולי"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "לותרני"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr "מתודיסט"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr "מורמוני"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "אורתודוקסי"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "פרוטסטנטי"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr "שיעי"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr "סוני"
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "כתובות"
@@ -22843,5 +23651,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "ערוך כתובת"
@@ -22849,5 +23657,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "מספר בית"
@@ -22855,25 +23663,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "שם בית"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "שם רחוב"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "שם עיר"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "מיקוד"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "קוד מדינה"
@@ -22882,5 +23690,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -22888,61 +23696,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr "סכמת מספור"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "אי-זוגי"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "זוגי"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr "מעשה אדם"
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "מגדל"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "ערוך מגדל"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr ""
@@ -22950,25 +23758,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "מגדל מים"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "ערוך מגדל מים"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "מגדלור"
@@ -22976,10 +23784,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "ערוך מגדלור"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "טחנת רוח"
@@ -22987,10 +23795,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "ערוך טחנת רוח"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "צינור"
@@ -22999,37 +23807,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "ערוך צינור"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
+msgid "gas"
+msgstr ""
+
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr ""
+
+#: build/trans_presets.java:2353
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-msgid "gas"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr ""
@@ -23039,10 +23847,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr ""
@@ -23050,21 +23858,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
-msgstr ""
-
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr ""
@@ -23072,10 +23875,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr ""
@@ -23083,11 +23886,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr ""
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr ""
@@ -23097,35 +23912,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "תחנת כח"
@@ -23134,10 +23949,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "ערוך תחנת כח"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr ""
@@ -23146,5 +23961,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -23152,10 +23967,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "עמוד חשמל"
@@ -23166,23 +23981,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "ערוך עמוד חשמל"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "קו מתח"
@@ -23191,79 +24006,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "ערוך קו מתח"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr ""
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr ""
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "שירותים"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "תיבת דואר"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "טלפון"
@@ -23272,5 +24082,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "ערוך טלפון"
@@ -23278,5 +24088,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr ""
@@ -23284,5 +24094,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr ""
@@ -23290,5 +24100,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -23296,5 +24106,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr ""
@@ -23302,15 +24112,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "כרטיסי טלפון"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr ""
@@ -23319,5 +24129,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "ערוך תחנת מיחזור"
@@ -23325,31 +24135,42 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+msgid "Edit Waste Basket"
 msgstr ""
 
@@ -23357,31 +24178,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr ""
@@ -23460,5 +24281,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -23468,31 +24289,31 @@
 msgstr "ירוק"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -23501,30 +24322,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "מזרקה"
@@ -23533,10 +24354,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "ערוך מזרקה"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "מי שתיה"
@@ -23545,10 +24366,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "ערוך מי שתיה"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr ""
@@ -23556,15 +24390,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "חנויות"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr ""
@@ -23572,10 +24406,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "ערוך חנות רכב"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr ""
@@ -23584,28 +24418,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "ערוך חנות אופניים"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "סופרמרקט"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "ערוך סופרמרקט"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr "מכולת"
@@ -23613,9 +24447,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr "ערוך מכולת"
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "קיוסק"
@@ -23623,27 +24457,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "ערוך קיוסק"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "מכונת ממכר"
@@ -23651,5 +24485,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "ערוך מכונת ממכר"
@@ -23657,88 +24491,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr "כרטיסים לתחבורה ציבורית"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr "מפות תחבורה ציבורית"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr "כרטיסי חניה"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "מזון"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "משקאות"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "ממתקים"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "סיגריות"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "תמונות"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "מזון בע\"ח"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "עיתונים"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "צעצועים"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "בולים"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "כרטיס SIM"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr "שוברי טלפון"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr "שוברים"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "קונדומים"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr "טמפונים"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr "שקיות צואה"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "קצבייה"
@@ -23746,9 +24580,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "ערוך קצבייה"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "מאפייה"
@@ -23756,9 +24590,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "ערוך מאפייה"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "פרחים"
@@ -23766,18 +24600,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "ערוך חנות פרחים"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr "ערוך חנות אורגנית"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr ""
@@ -23785,54 +24619,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "ערוך חנות מחשבים"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "ערוך חנות אלקטרוניקה"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "ערוך חנות רהיטים"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr ""
@@ -23840,9 +24674,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr ""
@@ -23850,9 +24684,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "חנות עשה-זאת-בעצמך"
@@ -23860,54 +24694,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "ערוך חנות עשה-זאת-בעצמך"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "מספרה"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "ערוך מספרה"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "ערוך חנות נעליים"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "ערוך חנות צעצועים"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr "ערוך חנות וידאו"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "ניקוי יבש"
@@ -23915,9 +24749,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "ערוך ניקוי יבש"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "מכבסה"
@@ -23925,9 +24759,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "ערוך מכבסה"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr ""
@@ -23935,28 +24769,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr "ערוך חנות ספורט"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "ערוך אופטיקאי"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "מזומן"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "בנק"
@@ -23964,14 +24798,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "ערוך בנק"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "כספומט"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "החלפת כסף"
@@ -23979,5 +24813,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "ערוך החלפת כסף"
@@ -23985,15 +24819,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "ערוך כספומט"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "בריאות"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "רופאים"
@@ -24001,18 +24835,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "ערוך רופאים"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "רופא שיניים"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "ערוך רופא שיניים"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "בית מרקחת"
@@ -24020,5 +24854,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "ערוך בית מרקחת"
@@ -24026,9 +24860,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "בית חולים"
@@ -24036,10 +24870,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "ערוך בית חולים"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr "נקודת גישה בחירום"
@@ -24048,5 +24882,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr "ערוך נקודת גישה בחירום"
@@ -24055,20 +24889,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr "מספר נקודה"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "מספר טלפון"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(השתמש בקדומת בינלאומית, למשל +12-345-67890)"
@@ -24076,5 +24910,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "וטרינרי"
@@ -24083,64 +24917,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "ערוך וטרינרי"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "מקומות"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "יבשת"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "ערוך יבשת"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "ארץ"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "ערוך ארץ"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "מדינה"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "ערוך מדינה"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "אזור"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "ערוך אזור"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr "מחוז"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr "ערוך מחוז"
@@ -24148,15 +24982,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "עיר"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "ערוך עיר"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "עיירה"
@@ -24164,10 +24998,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "ערוך עיירה"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "פרבר"
@@ -24175,25 +25009,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "ערוך פרבר"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "כפר"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "ערוך כפר"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "כפר קטן"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "ערוך כפר קטן"
@@ -24201,5 +25035,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr "מקומיות"
@@ -24207,10 +25041,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr "ערוך מקומיות"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "אי"
@@ -24218,10 +25052,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "ערוך אי"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr ""
@@ -24229,5 +25063,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr ""
@@ -24235,5 +25069,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "פתח מערה"
@@ -24241,10 +25075,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "ערוך פתח מערה"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "פסגה"
@@ -24252,10 +25086,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "ערוך פסגה"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "קרחון"
@@ -24263,10 +25097,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "ערוך קרחון"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "הר געש"
@@ -24274,70 +25108,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "ערוך הר געש"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "גבולות"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "לאומי"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "ערוך גבול לאומי"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "מנהלי"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "ערוך גבול מנהלי"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr "אזרחי"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr "ערוך תחום אזרחי"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr "פוליטי"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "ערוך תחום פוליטי"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr "גן לאומי"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "ערוך תחום גן לאומי"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "עץ"
@@ -24346,15 +25180,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "ערוך עץ"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "שם בוטני"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "חורש"
@@ -24363,5 +25197,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "ערוך חורש"
@@ -24369,17 +25203,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "מחטני"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "נשיר"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "מעורב"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "יער"
@@ -24388,14 +25222,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr ""
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -24403,25 +25237,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr ""
@@ -24429,10 +25263,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr "שדה-בור"
@@ -24440,5 +25274,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "ערוך שדה-בור"
@@ -24446,5 +25280,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr "חצר משק"
@@ -24453,45 +25287,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "אדמה חקלאית"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "כרם"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -24499,25 +25333,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr ""
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "דשא"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr ""
@@ -24525,10 +25359,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr ""
@@ -24536,20 +25370,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr ""
@@ -24557,5 +25391,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -24563,15 +25397,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "אזור מגורים"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "בית-קברות"
@@ -24579,9 +25413,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "ערוך בית-קברות"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "בית עלמין"
@@ -24589,39 +25423,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "קמעוני"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "מסחרי"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "תעשייתי"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr ""
@@ -24629,15 +25463,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "צבאי"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr ""
@@ -24645,50 +25479,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "אתר בניה"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "מחצבה"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr ""
@@ -24698,5 +25532,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr ""
@@ -24705,10 +25539,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr ""
@@ -24716,5 +25550,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr ""
@@ -24723,5 +25557,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -24729,34 +25563,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr ""
@@ -24765,15 +25599,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr ""
@@ -24781,5 +25615,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr ""
@@ -24788,5 +25622,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr ""
@@ -24794,5 +25628,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr ""
@@ -24883,5 +25717,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -24891,17 +25725,17 @@
 msgstr "אופניים"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr "אוטובוס"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr ""
@@ -24961,5 +25795,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -24968,9 +25802,9 @@
 msgstr "רגל"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr ""
@@ -24984,10 +25818,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "רכבת תחתית"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr ""
@@ -24995,31 +25829,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr ""
@@ -25028,107 +25862,32 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 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"
@@ -25663,77 +26422,4 @@
 #: build/trans_style.java:975 build/trans_style.java:983
 msgid "highway_track"
-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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
 msgstr ""
 
@@ -26122,7 +26808,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "באפטיסט"
+msgstr ""
 
 #. color manmade
@@ -29261,39 +29946,81 @@
 msgstr ""
 
-#~ msgid "Cycleway"
-#~ msgstr "שביל אופניים"
-
-#~ msgid "Footway"
-#~ msgstr "שביל להולכי רגל"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "ערוך צעידה"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "ערוך צעידה הררית"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "ערוך צעידה הררית מאומצת"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "ערוך צעידה אלפינית"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "ערוך צעידה אלפינית מאומצת"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "ערוך צעידה אלפינית קשה"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "פרמטר ''{0}'' אינו יכול להיות אפס"
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "אינדקס טור לא צפוי. התקבל {0}"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "הפרמטר 'col' חייב ליהיות 0 או 1. התקבל {0}"
-
-#~ msgid ">"
-#~ msgstr "<"
+#~ msgid "Move"
+#~ msgstr "הזז"
+
+#~ msgid "Data Layer"
+#~ msgstr "שכבת נתונים"
+
+#~ msgid "No data imported."
+#~ msgstr "לא יובאו נתונים."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "בחר סימניה תחילה."
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "אין כל מסמך פתוח ולכן אין מה לשמור."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "סיומת הקובץ אינה ידועה."
+
+#~ msgid "Email"
+#~ msgstr "דוא\"ל"
+
+#~ msgid "Load Selection"
+#~ msgstr "טען בחירה"
+
+#~ msgid "Contact {0}..."
+#~ msgstr "צור קשר עם {0}..."
+
+#~ msgid "Merging conflicts."
+#~ msgstr "התנגשויות מתמזגות"
+
+#~ msgid "Delete the selected layer."
+#~ msgstr "מחק את השכבה הנבחרת."
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "פתור התנגשויות"
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "ארעו התנגשויות במהלך הייבוא."
+
+#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
+#~ msgstr "לא ניתן לקרוא מהזמן \"{0}\" מהנקודה {1} x {2}"
+
+#~ msgid "No images with readable timestamps found."
+#~ msgstr "לא נמצאו תמונות עם חותמות זמין קריאות."
+
+#~ msgid "GPS start: {0}"
+#~ msgstr "התחלת GPS: {0}"
+
+#~ msgid "current delta: {0}s"
+#~ msgstr "הפרש נוכחי: {0}ש'"
+
+#~ msgid "GPS end: {0}"
+#~ msgstr "סיום GPS: {0}"
+
+#~ msgid "No time for point {0} x {1}"
+#~ msgstr "אין זמן לנקודה {0} x {1}"
+
+#~ msgid "timezone difference: "
+#~ msgstr "הפרש אזורי הזמן: "
+
+#~ msgid "Image"
+#~ msgstr "תמונה"
+
+#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+#~ msgstr "הזן את התאריך המוצג (mm/dd/yyyy HH:MM:SS)"
+
+#~ msgid "{0} within the track."
+#~ msgstr "{0} מתוך הרצועה."
+
+#~ msgid "Sync clock"
+#~ msgstr "סנכרן שעון"
+
+#~ msgid "The date in file \"{0}\" could not be parsed."
+#~ msgstr "לא ניתן לנתח את התאריך שבקובץ \"{0}\""
+
+#~ msgid "There is no EXIF time within the file \"{0}\"."
+#~ msgstr "אין נתוני שעה במבנה EXIF בתוך הקובץ \"{0}\"."
 
 #~ msgid "image"
@@ -29301,85 +30028,4 @@
 #~ msgstr[0] "תמונה"
 #~ msgstr[1] "תמונות"
-
-#~ msgid "Move"
-#~ msgstr "הזז"
-
-#~ msgid "Data Layer"
-#~ msgstr "שכבת נתונים"
-
-#~ msgid "No data imported."
-#~ msgstr "לא יובאו נתונים."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "בחר סימניה תחילה."
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "אין כל מסמך פתוח ולכן אין מה לשמור."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "סיומת הקובץ אינה ידועה."
-
-#~ msgid "Email"
-#~ msgstr "דוא\"ל"
-
-#~ msgid "Load Selection"
-#~ msgstr "טען בחירה"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "צור קשר עם {0}..."
-
-#~ msgid "Merging conflicts."
-#~ msgstr "התנגשויות מתמזגות"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "מחק את השכבה הנבחרת."
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "פתור התנגשויות"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "ארעו התנגשויות במהלך הייבוא."
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "לא ניתן לקרוא מהזמן \"{0}\" מהנקודה {1} x {2}"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "לא נמצאו תמונות עם חותמות זמין קריאות."
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "התחלת GPS: {0}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "הפרש נוכחי: {0}ש'"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "סיום GPS: {0}"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "אין זמן לנקודה {0} x {1}"
-
-#~ msgid "timezone difference: "
-#~ msgstr "הפרש אזורי הזמן: "
-
-#~ msgid "Image"
-#~ msgstr "תמונה"
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "הזן את התאריך המוצג (mm/dd/yyyy HH:MM:SS)"
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} מתוך הרצועה."
-
-#~ msgid "Sync clock"
-#~ msgstr "סנכרן שעון"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "לא ניתן לנתח את התאריך שבקובץ \"{0}\""
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "אין נתוני שעה במבנה EXIF בתוך הקובץ \"{0}\"."
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "לא ניתן לנתח את הזמן שהוזן."
 
 #~ msgid "Unsaved Changes"
@@ -29719,9 +30365,30 @@
 #~ msgstr "סנכרן את השעה עם יחידת ה-GPS"
 
-#~ msgid "Public"
-#~ msgstr "ציבורי"
-
 #~ msgid "Please choose a user using the author panel"
 #~ msgstr "בחר משתמש בעזרת פאנל המחברים"
+
+#~ msgid "Boat"
+#~ msgstr "סירה"
+
+#~ msgid "Motorboat"
+#~ msgstr "סירת מנוע"
+
+#~ msgid "Cycleway"
+#~ msgstr "שביל אופניים"
+
+#~ msgid "Footway"
+#~ msgstr "שביל להולכי רגל"
+
+#~ msgid "Edit Demanding Mountain Hiking"
+#~ msgstr "ערוך צעידה הררית מאומצת"
+
+#~ msgid "Edit Alpine Hiking"
+#~ msgstr "ערוך צעידה אלפינית"
+
+#~ msgid "Edit Hiking"
+#~ msgstr "ערוך צעידה"
+
+#~ msgid "Edit Mountain Hiking"
+#~ msgstr "ערוך צעידה הררית"
 
 #~ msgid ""
@@ -29821,4 +30488,10 @@
 #~ msgstr "מפת רכיבה"
 
+#~ msgid "Edit Demanding Alpine Hiking"
+#~ msgstr "ערוך צעידה אלפינית מאומצת"
+
+#~ msgid "Edit Difficult Alpine Hiking"
+#~ msgstr "ערוך צעידה אלפינית קשה"
+
 #~ msgid "Shop"
 #~ msgstr "חנות"
@@ -29830,12 +30503,6 @@
 #~ msgstr "ערוך תחנה"
 
-#~ msgid "Station"
-#~ msgstr "תחנה"
-
 #~ msgid "Replaces Selection with Users data"
 #~ msgstr "החלף בחירה עם נתוני משתמש"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "בחר דרכים עם זווית כמעט ישרה ליישור"
 
 #~ msgid "Checking whether node {0} is gone ..."
@@ -29881,4 +30548,7 @@
 #~ msgstr "הפרמטר '{0}' לא יכול ליהיות ריק (null)"
 
+#~ msgid ">"
+#~ msgstr "<"
+
 #~ msgid "Apply partial resolutions"
 #~ msgstr "החל פתרון חלקי"
@@ -29899,4 +30569,7 @@
 #~ msgstr "רמז: כמה מהשינויים נובעים מהעלאת נתונים חדשים לשרת."
 
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "פרמטר ''{0}'' אינו יכול להיות אפס"
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "ערך מוחזר לא צפוי. התקבל {0}"
@@ -29908,4 +30581,10 @@
 #~ msgstr "לא נמצאה גירסה מאוחרת. ההיסטוריה ריקה."
 
+#~ msgid "Unexpected column index. Got {0}."
+#~ msgstr "אינדקס טור לא צפוי. התקבל {0}"
+
+#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
+#~ msgstr "הפרמטר 'col' חייב ליהיות 0 או 1. התקבל {0}"
+
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "לא ניתן לקרוא את \"{0}\""
Index: applications/editors/josm/i18n/po/is.po
===================================================================
--- applications/editors/josm/i18n/po/is.po	(revision 19689)
+++ applications/editors/josm/i18n/po/is.po	(revision 19698)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-19 00:01-0500\n"
-"PO-Revision-Date: 2010-01-17 23:06-0500\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-23 21:51+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-01-13 18:28+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -70,11 +70,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -235,5 +235,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -247,13 +247,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -262,5 +262,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -287,5 +290,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Sameina"
@@ -314,5 +317,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -379,9 +382,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -389,5 +392,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "Í lagi"
@@ -438,6 +443,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -455,5 +460,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -462,11 +467,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -503,5 +508,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "árekstri"
@@ -636,14 +641,14 @@
 msgstr "Vinsamlegast veldu a.m.k. tvo vegi til að sameina."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Afrita"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Afrita valda hluti á klemmuborðið."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Veldu eithvað til að afrita"
@@ -674,8 +679,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -684,5 +689,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -746,9 +751,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "Vensl rekast á"
-msgstr[1] "Vensl rekast á"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -769,4 +773,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -776,4 +782,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Tvöfalda valið með því að afrita það og líma það aftur."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Tvöfalda"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "Færa valda meðlimi upp"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "Lag: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "Þysja að {0}"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr ""
 
 #. <button label="Info" hotkey="I">
@@ -864,10 +898,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 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] "Vegurinn sem þú valdir inniheldur ekki hnútinn sem þú valdir."
-msgstr[1] "Vegirnir sem þú valdir innihalda ekki hnútana sem þú valdir."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -986,5 +1019,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr ""
@@ -1134,5 +1167,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr ""
 
@@ -1146,9 +1179,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Opna skrár"
-msgstr[1] "Opna skrár"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1204,7 +1237,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1218,5 +1251,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "Færa hnúta á lokuðum vegi til svo öll horn séu 90 eða 270 gráður"
 
@@ -1252,4 +1286,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+msgid "Selection must consist only of ways and nodes."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
 msgid "Orthogonalize"
@@ -1263,4 +1301,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204
 msgid "Selected Elements cannot be orthogonalized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
 msgstr ""
 
@@ -1367,18 +1415,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1403,12 +1451,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Villa"
@@ -1540,5 +1589,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1782,5 +1831,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr ""
@@ -2194,6 +2243,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2308,5 +2357,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Leita að hlutum."
@@ -2495,5 +2544,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Leit"
@@ -2533,24 +2582,22 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "stafsetursnæmt"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
-msgstr "stafsetursónæmt"
+msgstr ""
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2560,9 +2607,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2697,9 +2744,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "Breyta {0} hlut"
-msgstr[1] "Breyta {0} hlutum"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2754,7 +2801,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Setti {0}={1} á hnút „{2}“"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2812,17 +2859,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Eyða {0} hnút"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Eyða {0} hnút"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Fjarlægja úr venslum"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2903,9 +2950,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "Breyta {0} hlut"
-msgstr[1] "Breyta {0} hlutum"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -2970,7 +3017,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Eyða valinu úr venslunum {0}?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3215,5 +3262,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3221,5 +3268,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3227,5 +3274,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3233,5 +3280,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3304,22 +3351,19 @@
 #. column header: filter text
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
-#, fuzzy
 msgctxt "filter"
 msgid "Text"
-msgstr "Næsta"
+msgstr ""
 
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "stafsetursnæmt"
+msgstr ""
 
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
-#, fuzzy
 msgctxt "filter"
 msgid "I"
-msgstr "stafsetursónæmt"
+msgstr ""
 
 #. column header: filter mode
@@ -3354,19 +3398,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3375,5 +3419,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3381,5 +3425,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3457,7 +3501,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:327
-#, fuzzy
 msgid "The \"to\" way does not start or end at a \"via\" node."
-msgstr "Vegurinn sem þú valdir inniheldur ekki hnútinn sem þú valdir."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
@@ -3503,6 +3546,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3512,5 +3555,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3521,7 +3564,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3543,5 +3586,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "bakgrunnur"
@@ -3685,6 +3728,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3692,37 +3735,38 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "óklárað"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "vatnsfarvegur"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3731,10 +3775,10 @@
 msgstr[1] "{0} hnútar"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3743,5 +3787,5 @@
 msgstr[1] "{0} stök"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3778,6 +3822,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Árekstrar"
@@ -3788,5 +3832,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-msgid "Authorization Failed"
+msgid "Authorisation Failed"
 msgstr ""
 
@@ -3983,5 +4027,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Upphafsstilli"
@@ -4022,5 +4065,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4031,5 +4074,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Breyta"
@@ -4100,29 +4143,29 @@
 msgstr "skali"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Lengdargráðan undir músabendlinum."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The name of the object at the mouse pointer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Breiddargráðan undir músabendlinum."
 
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+msgid "The angle between the previous and the current way segment."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
-msgid "The 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:105
-msgid "The (compass) heading of the line segment being drawn."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
 msgid "The length of the new way segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4130,9 +4173,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(enginn hlutur)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4292,9 +4335,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "árekstri"
-msgstr[1] "árekstri"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
@@ -4356,16 +4399,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4561,8 +4604,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr "Sameina valda hnúta á staðsetningu þess elsta."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4710,5 +4757,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr ""
@@ -4754,5 +4801,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -4882,10 +4934,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr ""
@@ -4915,7 +4967,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-#, fuzzy, java-format
+#, java-format
 msgid "Tag collection does not include the selected value ''{0}''."
-msgstr "Vegurinn sem þú valdir inniheldur ekki hnútinn sem þú valdir."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
@@ -4965,7 +5017,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -4975,6 +5027,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5154,10 +5206,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5177,18 +5229,18 @@
 msgstr "Skipanasaga: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Leysa"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5221,5 +5273,5 @@
 "<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.Click <strong>{0}</strong> to close anyway."
+"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.</"
@@ -5245,5 +5297,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5252,5 +5304,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5330,43 +5382,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Lög"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 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:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Sýna/Fela"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr "Virkja valið lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr "Sameina þetta lag öðru lagi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Hnútur endurtekinn í vegi"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 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:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Færa valið lag niður í röðinni"
@@ -5380,6 +5437,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Vensl"
@@ -5389,69 +5446,69 @@
 msgstr "Sýna lista yfir vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "Vensl: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Opna ritil til að breyta völdum venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Eyða völdum venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Skapa ný vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Afrita þessi vensl og opna breytingarglugga fyrir afritið"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Núverandi val"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Opna vallistann."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Þysja að völdum hlut(um)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Þysja að vali"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Val: Hnútar:{2} / Vegir:{1} / Vensl:{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5459,5 +5516,5 @@
 msgstr "Val"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5810,8 +5867,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -5883,4 +5938,7 @@
 #. <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 />
@@ -5959,6 +6017,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6000,6 +6059,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6468,152 +6529,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Heiti"
@@ -6996,5 +7059,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<mismunandi>"
@@ -7049,55 +7112,55 @@
 msgstr "Bæti vað eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "{0} eigindi & {1} vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Eigindi & vensl"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Breyta venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "Fjarlægja úr venslum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Eyða valinu úr venslunum {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Eyða völdum lykil í öllum völdum hlutum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "Eyða eigindum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Bæta nýjum eigindum við valda hluti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Breyta gildi valins lykils í öllum völdum hlutum"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7429,7 +7492,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
-#, fuzzy
 msgid "Do you really want to apply the new role?"
-msgstr "Ert þú viss um að þú viljir eyða laginu „{0}“?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
@@ -7545,47 +7607,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Bókamerki"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../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:187
+#: ../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:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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:212
+#: ../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:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr ""
@@ -7708,18 +7769,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -7730,34 +7791,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
 msgid "Enter a place name to search for:"
 msgstr "Sláðu inn nafn á stað til að leita að"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+#: ../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:147
+#: ../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:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Núll bendill, hugsanlega vantar eigindi."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr ""
@@ -7768,7 +7829,9 @@
 #. 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" />
@@ -7777,10 +7840,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Gerð"
@@ -7789,5 +7853,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -7799,17 +7863,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "óskilgreint"
@@ -8154,5 +8217,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr ""
@@ -8595,9 +8658,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8607,7 +8670,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -8619,16 +8682,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "Lag"
@@ -9045,68 +9108,68 @@
 msgstr[1] "{0} hlutum verður eytt:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Sérsníða teikningu lína"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Use global settings."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Sérsníða liti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Veldu lit"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Flytja inn hljóð"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9116,23 +9179,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Flytja inn myndir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9142,5 +9205,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9148,5 +9211,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9154,5 +9217,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9162,23 +9225,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "Lýsing"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr "Tímaspan"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr "Lengd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Lengd: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9187,5 +9250,5 @@
 msgstr[1] "{0} leiðir, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9194,10 +9257,10 @@
 msgstr[1] "{0} punktar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Breyta í gagnalag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9205,43 +9268,43 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9250,9 +9313,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9260,5 +9323,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9266,23 +9329,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Gagnalag {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr "útgáfa {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9291,5 +9354,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9303,5 +9366,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9314,11 +9377,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9327,32 +9390,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "Tölfræði um {0}:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr "API útgáfa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Breyta í GPX-lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9399,28 +9462,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "GPS punktar"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX skrár (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9429,34 +9491,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9464,64 +9526,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9531,45 +9593,45 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9578,5 +9640,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9584,41 +9646,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 msgid "The selected photos do not contain time information."
-msgstr "Vegurinn sem þú valdir inniheldur ekki hnútinn sem þú valdir."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
 "one."
-msgstr "Vegurinn sem þú valdir inniheldur ekki hnútinn sem þú valdir."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9627,5 +9687,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9634,63 +9694,63 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Les {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "Engin göng eru hlaðin til að vinna með."
-msgstr[1] "Engin göng eru hlaðin til að vinna með."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -9699,10 +9759,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -9711,5 +9771,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -9802,5 +9862,5 @@
 msgstr "gps punktur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -9808,5 +9868,5 @@
 msgstr[1] "punktar"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -9815,29 +9875,29 @@
 msgstr[1] "{0} samanstendur af {1} punktum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 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:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -9845,17 +9905,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Sýna/Fela texta og táknmyndir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
+#: ../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 "
@@ -9863,5 +9923,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -9869,5 +9929,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr ""
@@ -9893,5 +9953,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
 #, java-format
 msgid ""
@@ -9899,5 +9959,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
 #, java-format
 msgid ""
@@ -9949,7 +10009,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
 msgid "Authorize URL:"
-msgstr "Notandi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10039,7 +10098,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
 msgid "Authorize now"
-msgstr "Notandi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10177,7 +10235,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
 msgid "Please select an authorization procedure: "
-msgstr "Veldu minnst fjóra hnúta"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10499,5 +10556,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Veldu hlut til að breyta fyrst."
@@ -10511,5 +10568,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10646,9 +10703,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "Lag: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -10678,6 +10730,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr ""
@@ -10716,8 +10768,8 @@
 msgstr ""
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Bíll"
@@ -10739,13 +10791,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Hjól"
@@ -10778,12 +10830,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "Fótgangandi"
@@ -11010,5 +11062,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java:68
 msgid "Map Paint Styles"
-msgstr ""
+msgstr "Teiknistíll korts"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:68
@@ -11742,5 +11794,12 @@
 msgstr "Eyða völdum hlutum úr listanum yfir tögg"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -11748,18 +11807,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "Valfrjáls eigind:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -11770,16 +11829,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -11788,18 +11847,17 @@
 msgstr[1] "Breyta {0} hlutum"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "Ekkert er valið!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "Val óhæfilegt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "Vista forstillingu"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Breyta eigindum"
@@ -12071,6 +12129,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12095,9 +12153,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12120,7 +12178,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
@@ -12192,5 +12256,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr ""
@@ -12291,9 +12355,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Breyta {0} hlut"
-msgstr[1] "Breyta {0} hlutum"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -13187,5 +13251,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13193,8 +13256,4 @@
 "file a bug report."
 msgstr ""
-"Óvænt undantekning átti sér stað\n"
-"\n"
-"þetta er alltaf forritunarvilla. Ef þú ert að keyra nýjustu \n"
-"útgáfuna af JOSM, vinsamlegast sendu þá inn villumeldinguna."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13286,6 +13345,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -13401,6 +13460,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13409,5 +13468,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -13555,4 +13614,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr ""
@@ -13643,5 +13703,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr ""
@@ -14220,5 +14280,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr ""
@@ -14375,21 +14435,21 @@
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr ""
@@ -14421,9 +14481,9 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -14438,13 +14498,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr ""
@@ -14453,6 +14513,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr ""
@@ -14678,17 +14738,17 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../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:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -14732,42 +14792,41 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr "Óþekkt villa kom upp"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr ""
@@ -14823,6 +14882,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -14831,73 +14890,73 @@
 msgstr "vatn"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "strandlengja"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "land"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../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:43
+#: ../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:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../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:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../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:55
+#: ../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:57
+#: ../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:59
+#: ../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:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr "WMS lag"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../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:67
+#: ../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:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14905,5 +14964,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -14911,5 +14970,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14917,58 +14976,58 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../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:79
+#: ../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:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../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:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr ""
@@ -14992,5 +15051,5 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr ""
@@ -15021,5 +15080,5 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr ""
@@ -15093,5 +15152,5 @@
 msgstr "Hornið milli tveggja valinna nóða"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr "Lag ætlað til mælinga"
@@ -15348,4 +15407,70 @@
 #: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:135
 msgid "Firefox executable"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+msgid "Read error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Sláðu inn hnit fyrir nýja hnútinn."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+msgid "keep backup files"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Villa"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+msgid "File could not be deleted!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Endurnefna skránna líka"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+msgid "Override old backup files?"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+msgid "Keep old backups and continue"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Yfirskrifa"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+msgid "Could not delete temporary file!"
 msgstr ""
 
@@ -15619,6 +15744,6 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -15740,72 +15865,128 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+msgid "Terrace a house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+#, fuzzy
+msgid "Interpolation"
+msgstr "Upplýsingar"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Stræti"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Reitnúmer"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Reitnúmer"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+msgid "Lowest housenumber of the terraced house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Skapa ný vensl"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Eyða hnútum eða vegum"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Nafn götu"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../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:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr ""
@@ -16037,5 +16218,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr ""
@@ -16045,5 +16226,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16055,9 +16236,9 @@
 "verið að nota þá.<br>Ertu viss um að þú viljir eyða þeim?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr ""
@@ -16092,5 +16273,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr "Marghyrningur"
@@ -16235,7 +16416,7 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -16243,80 +16424,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16324,86 +16505,86 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -16843,5 +17024,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -16852,63 +17033,63 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
-msgid ""
-"The requested area is too big. Please zoom in a little, or change resolution"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
 msgid "Download visible tiles"
 msgstr "Niðurhala sýnilega reiti"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+msgid ""
+"The requested area is too big. Please zoom in a little, or change resolution"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "Breyta upplausn"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr "Hlaða reiti sem innihalda villur"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "Vista WMS lag í skrá"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "Hlaða WMS lag úr skrá"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -17159,6 +17340,13 @@
 msgstr ""
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17167,15 +17355,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17184,10 +17372,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17196,15 +17384,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17214,10 +17402,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17226,5 +17414,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17233,10 +17421,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -17343,6 +17531,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -17350,6 +17547,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "Tilvísun"
@@ -17366,5 +17564,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Akreinar"
@@ -17386,10 +17584,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Hámarkshraði (km/klst)"
@@ -17433,14 +17631,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "Einstefnuvegur"
@@ -17483,13 +17681,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -17527,13 +17725,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Göng"
@@ -17568,13 +17766,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "Niðurgrafinn"
@@ -17609,13 +17807,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "Upphækkun"
@@ -17747,4 +17945,13 @@
 msgid "Edit Unclassified Road"
 msgstr "Breyti óflokkuðum veg"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr ""
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -17762,15 +17969,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr "Breidd (í metrum)"
@@ -17782,5 +17989,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Íbúðargata"
@@ -17789,5 +17996,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "Breyti íbúðargötu"
@@ -17805,16 +18012,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Slitlag"
@@ -17836,166 +18046,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr "malbikaður"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr "ómalbikaður"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "skógur"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr "götusteinn"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr ""
@@ -18003,5 +18220,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr "Vistgata"
@@ -18010,5 +18227,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr "Breyti vistgötu"
@@ -18016,5 +18233,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "Göngugata"
@@ -18023,5 +18240,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "Breyti göngugötu"
@@ -18029,5 +18246,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr "Þjónustuvegur"
@@ -18036,5 +18253,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr "Breyta þjónustuveg"
@@ -18044,18 +18261,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr "Gerð þjónustuvegs"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr "port"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr "heimreið"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr "bílastæðavegur"
@@ -18063,5 +18280,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr "Bílastæðavegur"
@@ -18071,5 +18288,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr "Breyti bílastæðaveg"
@@ -18077,5 +18294,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "Vegur (óþekkt flokkun)"
@@ -18084,5 +18301,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "Breyti veg af óþekktri flokkun"
@@ -18091,20 +18308,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "Vegtakmarkanir"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "Breyti vegtakmörkunum"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "Tollur"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -18112,9 +18329,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 msgid "Access"
 msgstr "Aðgangur"
 
 #. 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"
@@ -18125,6 +18343,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18136,4 +18352,5 @@
 #. 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"
@@ -18152,141 +18369,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+msgid "yes"
+msgstr "já"
+
+#. 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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "einkavegur"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr "leyfður"
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr "í landbúnaðarskyni"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-msgid "yes"
-msgstr "já"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "einkavegur"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr ""
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr "leyfður"
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr "í landbúnaðarskyni"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "nei"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -18301,10 +18526,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr "Hestar"
@@ -18320,10 +18545,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "Vélhjól"
@@ -18338,27 +18563,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr "Bifreið"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr ""
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr ""
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Lámarkshraði (km/klst)"
@@ -18366,25 +18583,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "Hámarksþyngt (í tonnum)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr "Hámarkshæð (í metrum)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr "Hámarksbreidd (í metrum)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr "Hámarkslengd (í metrum)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "Hringtorg"
@@ -18395,5 +18612,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "Breyti hringtorgi"
@@ -18413,10 +18630,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "hraðbraut"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr "tengibraut á hraðbraut"
@@ -18438,10 +18655,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "stofnvegur"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr ""
@@ -18463,10 +18680,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr ""
@@ -18488,5 +18705,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -18501,9 +18718,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr "óflokkaður"
@@ -18517,9 +18734,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "íbúðargata"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr "vistgata"
@@ -18549,10 +18766,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "þjónustuvegur"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr ""
@@ -18582,5 +18799,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -18592,10 +18809,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Breyti brú"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr "Breyti göngum"
@@ -18603,19 +18820,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Vegir"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "Í byggingu"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "Breyti veg í byggingu"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "Hringtorg"
@@ -18631,5 +18848,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "hringtorg"
@@ -18637,5 +18854,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr ""
@@ -18644,35 +18861,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "Gerð"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -18680,5 +18896,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -18686,27 +18902,26 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "Gosbrunnur"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
 msgstr ""
@@ -18714,5 +18929,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr ""
@@ -18721,6 +18936,27 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
+msgstr ""
+
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
 msgstr ""
 
@@ -18741,7 +18977,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "Breyti reiðstíg"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -18754,7 +18989,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "Breyti hjólastíg"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -18789,24 +19023,21 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "Sameina þá"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "Breyti göngustíg"
+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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Breyti göngustíg"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr ""
@@ -18814,5 +19045,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "Stigi"
@@ -18822,5 +19053,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Breyti stiga"
@@ -18828,10 +19059,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr "Vegpunktar"
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr ""
@@ -18839,15 +19070,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "Tilvísun"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "Vegþjónustur"
@@ -18855,5 +19086,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr "Breyti vegþjónustu"
@@ -18861,5 +19092,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -18892,17 +19124,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "Rekstraraðili"
@@ -18911,5 +19143,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "Umferðarljós"
@@ -18919,5 +19151,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -18926,27 +19158,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "eyja"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr ""
@@ -18954,6 +19186,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr ""
@@ -18962,11 +19194,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -18974,30 +19206,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr ""
@@ -19005,5 +19237,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr "Gangbraut"
@@ -19012,14 +19244,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr "Smáhringtorg"
@@ -19030,14 +19308,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr "Átt"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr "réttsælis"
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr "Beygjuhringur"
@@ -19047,26 +19325,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "Borgarmörk"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "Breyti borgarmarkaskilti"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 msgid "Speed Camera"
 msgstr "Hraðamyndavél"
 
 #. 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "Neyðarsími"
@@ -19074,5 +19354,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr ""
@@ -19080,5 +19360,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr ""
@@ -19086,11 +19366,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr "Vað"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr "Breyti vaði"
@@ -19098,5 +19385,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr "Skarð"
@@ -19104,5 +19391,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr "Breyti skarði"
@@ -19114,7 +19401,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "Hæð (y/s)"
@@ -19122,5 +19409,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Tálmar"
@@ -19128,5 +19415,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr ""
@@ -19134,5 +19421,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr ""
@@ -19177,16 +19464,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "Leyfileg umferð:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr ""
@@ -19195,5 +19482,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr ""
@@ -19201,5 +19488,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr "Rimlahlið"
@@ -19207,10 +19494,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr "Breyti rimlahliði"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr ""
@@ -19218,15 +19505,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "Tollskýli"
@@ -19234,5 +19521,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "Breyti tollskýli"
@@ -19240,10 +19527,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr "Landamæraeftirlit"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr "Breyti landamæraeftirliti"
@@ -19253,5 +19540,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr "Limgerði"
@@ -19260,12 +19547,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
-msgid "Fence"
-msgstr ""
-
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#: build/trans_presets.java:817 build/trans_presets.java:819
+msgid "Fence"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr ""
@@ -19273,5 +19572,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "Borgarveggur"
@@ -19280,5 +19579,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr ""
@@ -19290,15 +19589,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr "Inngangur"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr "Breyti inngang"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "Hlið"
@@ -19306,50 +19606,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr "Breyti hliði"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr "Liftuhlið"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr "Breyti liftuhliði"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr ""
@@ -19357,25 +19657,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr ""
@@ -19386,11 +19686,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "Vatn"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "Goshver"
@@ -19398,5 +19698,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "Breyti goshver"
@@ -19404,5 +19704,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr "Frárennsli"
@@ -19410,10 +19710,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr "Breyti frárennsli"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "Lækur"
@@ -19421,10 +19732,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "Breyti læk"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "Skipaskurður"
@@ -19432,10 +19743,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "Breyti skipaskurð"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "Á"
@@ -19445,5 +19756,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "Breyti á"
@@ -19451,15 +19762,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Breyti vatni"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "Breyti landi"
@@ -19467,15 +19778,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr ""
@@ -19483,15 +19794,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -19499,5 +19810,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "Árbakki"
@@ -19506,10 +19817,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "Breyti árbakka"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr "Votlendi"
@@ -19520,14 +19831,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr "Breyti votlendi"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr ""
@@ -19541,35 +19852,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "Leðja"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr "Breyti leðju"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "Strönd"
@@ -19577,20 +19888,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "Breyti strönd"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "Flói"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "Breyti flóa"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "Klettur"
@@ -19598,10 +19909,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "Breyti klett"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "Strandlengja"
@@ -19609,5 +19920,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "Breyti strandlengju"
@@ -19615,5 +19926,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "Siglingarleið ferju"
@@ -19621,5 +19932,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr ""
@@ -19628,5 +19939,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr ""
@@ -19634,10 +19945,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "Skipakví"
@@ -19645,5 +19956,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr "Breyti skipakví"
@@ -19651,5 +19962,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "Stífla"
@@ -19657,15 +19968,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "Breyti stíflu"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr "Vatnspunktar"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr ""
@@ -19674,5 +19985,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr ""
@@ -19680,20 +19991,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "Foss"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "Breyti fossi"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr ""
@@ -19702,15 +20013,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr "Smábátahöfn"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr "Breyti smábátahöfn"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "Bryggja"
@@ -19718,10 +20029,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "Breyti bryggju"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr ""
@@ -19729,10 +20040,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr ""
@@ -19742,20 +20053,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr "Samgöngur"
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr ""
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr ""
@@ -19763,5 +20074,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr ""
@@ -19770,139 +20081,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr ""
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr ""
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr ""
+
+#. item "Man Made/Power Line" text "Line reference"
+#. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
+#: build/trans_presets.java:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+msgid "Voltage"
+msgstr "Volt"
+
+#. 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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr ""
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr ""
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr ""
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr ""
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr ""
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr ""
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr ""
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr ""
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr ""
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr ""
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr ""
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr ""
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr ""
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr ""
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr ""
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr ""
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr ""
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr ""
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr ""
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr ""
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr ""
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr ""
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr ""
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr ""
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr ""
@@ -19911,5 +20461,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr ""
@@ -19918,5 +20468,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr ""
@@ -19926,5 +20476,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr ""
@@ -19932,5 +20482,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr ""
@@ -19939,10 +20489,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr "Skíðalyfta"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "Stólalyfta"
@@ -19950,10 +20507,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr "Breyti stólalyftu"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr "Toglyfta"
@@ -19961,10 +20518,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr "Breyti toglyftu"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "Kláfur"
@@ -19972,10 +20529,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "Breyti kláf"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr ""
@@ -19983,10 +20540,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -19994,12 +20551,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr ""
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "Bensínstöð"
@@ -20009,9 +20579,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Breyti bensínstöð"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20065,32 +20692,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "Opnunartími"
@@ -20149,94 +20776,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20248,5 +20951,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20256,5 +20959,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Breyti stæði"
@@ -20265,25 +20968,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr "Tilvísun"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "slitlag"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr ""
@@ -20292,48 +20995,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "Bílaþvottastöð"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "Breyti bílaþvottastöð"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr ""
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr ""
@@ -20341,5 +21044,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "Leiga"
@@ -20348,10 +21051,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "Breyti bílaleigu"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr ""
@@ -20359,5 +21062,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr ""
@@ -20365,10 +21068,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "Breyti hjólastæði"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr ""
@@ -20377,15 +21080,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "Breyti hjólaleigu"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Almenningssamgöngur"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -20395,5 +21098,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -20401,5 +21104,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr "UIC-Tilvísun"
@@ -20407,5 +21110,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr ""
@@ -20413,5 +21116,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr ""
@@ -20419,5 +21122,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr ""
@@ -20426,5 +21129,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr ""
@@ -20432,5 +21135,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr ""
@@ -20439,5 +21142,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr ""
@@ -20449,5 +21152,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr ""
@@ -20455,10 +21158,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr ""
@@ -20467,10 +21170,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr ""
@@ -20479,5 +21182,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "Strætóstöð"
@@ -20486,5 +21189,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "Breyti strætóstöð"
@@ -20492,5 +21195,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "Strætóstopp"
@@ -20500,5 +21203,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "Breyti strætóstoppi"
@@ -20507,25 +21210,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr "Skýli"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "Bekkur"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr ""
@@ -20533,5 +21237,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "Leigubílastöð"
@@ -20539,5 +21243,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "Breyti leigubílastöð"
@@ -20545,32 +21249,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "Flugvöllur"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr "Breyti flugvelli"
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr ""
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr ""
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr "Ferðamennska"
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Gisting"
@@ -20582,5 +21381,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hótel"
@@ -20589,15 +21388,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "Breyti hóteli"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "Stjörnur"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr "Vegahótel"
@@ -20605,20 +21404,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr "Breyti vegahóteli"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr "Gistiheimili"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr "Breyti gistiheimili"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "Fjallakofi (e. Chalet)"
@@ -20626,10 +21425,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr "Breyti fjallakofa í svissneskum stíl (e. Chalet)"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr "Farfuglaheimili"
@@ -20637,30 +21436,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr "Breyti farfuglaheimili"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr "Húsbílastæði"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr "Breyti húsbílastæði"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "Tjaldstæði"
@@ -20668,10 +21467,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr "Breyti tjaldstæði"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Matur & Drykkur"
@@ -20682,5 +21481,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Veitingastaður"
@@ -20688,5 +21487,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "Breyti veitingastað"
@@ -20694,5 +21493,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr "Matargerð"
@@ -20700,61 +21499,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "ítölsk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "kínversk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "hamborgarar"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "grísk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "þýsk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "indversk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "að hætti heimamanna"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "tyrknesk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "asísk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "tælensk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "mexíkósk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "japönsk"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "Skyndibiti"
@@ -20762,9 +21573,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "Breyti skyndibitastað"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "Kaffihús"
@@ -20772,9 +21591,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "Breyti kaffihúsi"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "Bar"
@@ -20782,18 +21601,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "Breyti bar"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr "Bjórgarður (þ. Biergarten)"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr "Breyti bjórgarði (þýska: Biergarten)"
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr ""
@@ -20801,9 +21620,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "Næturklúbbur"
@@ -20811,24 +21630,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "Breyti næturklúbb"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Ferðamennska"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Safn"
@@ -20836,9 +21655,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Breyti safni"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Dýragarður"
@@ -20847,9 +21666,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Breyti dýragarð"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "Útsýnisstaður"
@@ -20857,24 +21676,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "Breyti útsýnisstað"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "Skemmtigarður"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr "Breyti skemmtigarð"
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "Listaverk"
@@ -20882,5 +21701,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "Breyti listaverki"
@@ -20888,19 +21707,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr "Upplýsingamiðstöð"
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Kort"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr ""
@@ -20938,5 +21757,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -20944,28 +21763,28 @@
 msgstr "stræti"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr "Nánari lýsing"
@@ -20975,5 +21794,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr ""
@@ -20981,5 +21800,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr ""
@@ -20987,6 +21806,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr ""
@@ -20994,5 +21813,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr ""
@@ -21000,6 +21819,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "Skíði"
@@ -21007,5 +21826,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr ""
@@ -21013,46 +21832,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr "Fræðsluskilti"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "sagnfræði"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr "náttúran"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr "dýralíf"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr ""
@@ -21060,29 +21879,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr "Breyti skýli"
@@ -21090,25 +21909,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr "Eldstæði"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Sögustaðir"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Kastali"
@@ -21117,19 +21936,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Breyti kastala"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Rústir"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Breyti rústum"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Fornleifasvæði"
@@ -21138,9 +21957,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "Breyti fornleifasvæði"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "Vígvöllur"
@@ -21148,10 +21967,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "Breyti vígvelli"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr ""
@@ -21159,5 +21978,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -21165,15 +21984,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "Minnismerki"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "Breyti minnismerki"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "Minnisvarði"
@@ -21181,55 +22000,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "Breyti minnisvarða"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Frístundir"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "Vatnsleikjagarður"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "Breyti vatnsleikjagarð"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Leikvöllur"
@@ -21237,35 +22056,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Breyti leikvöll"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Fiskveiðar"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "Breyti fiskveiðum"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr "Íþróttir"
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr "Íþróttamannvirki"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Íþróttaleikvangur"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Breyti íþróttaleikvang"
@@ -21279,6 +22098,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "veldu íþrótt:"
@@ -21670,6 +22489,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -21703,225 +22522,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "bogfimi"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "ástralskur fótbolti"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "hafnabolti"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "körfubolti"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "klifur"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "fótbolti"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "hokkí"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "skotfimi"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr "skautar"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "skíði"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "fótbolti"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "sund"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "borðtennis"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "Íþróttamiðstöð"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "Breyti íþróttamiðstöð"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr "Völlur"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr "Breyti velli"
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "Golfvöllur"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "Breyti golfvelli"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Íþróttir"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr ""
@@ -21960,21 +22779,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "gerð"
@@ -22013,203 +22832,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr "völlur"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "íþróttamiðstöð"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "íþróttaleikvangur"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "Bogfimi"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "Breyti bogfimi"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "Klifur"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "Breyti klifri"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr ""
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr "Skautar"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr "Breyti skautum"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "Sund"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "Breyti sundi"
@@ -22217,56 +23036,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr "Breyti skíðasvæði"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr ""
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "Skotfimi"
@@ -22274,182 +23089,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "Breyti skotfimi"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "Boltaíþróttir"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "Fótbolti"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr "Breyti fótbolta"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "Amerískur fótbolti"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr "Breyti Amerískum fótbolta"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr "Ástralskur fótbolti"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr "Breyti Áströlskum fótbolta"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "Hafnabolti"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr "Breyti hafnabolta"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "Körfubolti"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "Breyti körfubolta"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "Hokkí"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "Breyti hokkí"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "Borðtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "Breyti borðtennis"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "Breyti tennis"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr "Mannvirki"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Byggingar"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "Bygging"
@@ -22457,5 +23272,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Opinber bygging"
@@ -22463,10 +23278,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Breyti opinberri byggingu"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "Ráðhús"
@@ -22474,10 +23289,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Breyti ráðhúsi"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Sendiráð"
@@ -22485,10 +23300,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Breyti sendiráði"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "Dómshús"
@@ -22497,10 +23312,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Breyti dómshúsi"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Fangelsi"
@@ -22509,10 +23324,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Breyti fangelsi"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Lögreglustöð"
@@ -22522,10 +23337,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Breyti lögreglustöð"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "Slökkvistöð"
@@ -22534,10 +23349,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Breyti slökkvistöð"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Pósthús"
@@ -22545,5 +23360,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Breyti pósthúsi"
@@ -22551,15 +23366,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "Leikskóli"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "Breyti leikskóla"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "Skóli"
@@ -22567,10 +23382,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "Breyti skóla"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "Háskóli"
@@ -22578,10 +23393,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "Breyti háskóla"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "Menntaskóli"
@@ -22589,5 +23404,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "Breyti menntaskóla"
@@ -22595,5 +23410,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Kvikmyndahús"
@@ -22602,10 +23417,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Breyti kvikmyndahúsi"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "Bókasafn"
@@ -22614,9 +23429,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Breyti bókasafni"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "Listamiðstöð"
@@ -22624,10 +23439,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "Breyti listamiðstöð"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Leikhús"
@@ -22636,10 +23451,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Breyti leikhúsi"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "Helgistaður"
@@ -22649,5 +23464,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "Breyti helgistað"
@@ -22656,6 +23471,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr ""
@@ -22664,66 +23479,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr ""
@@ -22732,81 +23547,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Heimilisfang"
@@ -22815,5 +23630,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Breyti heimilisfangi"
@@ -22821,5 +23636,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "Húsnúmer"
@@ -22827,25 +23642,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "Nafn húss"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Nafn götu"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "Nafn bæjar"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Póstnúmer"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "Landskóði"
@@ -22854,5 +23669,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -22860,61 +23675,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr "Mannvirki"
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Turn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Breyti turni"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr ""
@@ -22922,25 +23737,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Vatnsturn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Breyti vatnsturni"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "Viti"
@@ -22948,10 +23763,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Breyti vita"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Vindmylla"
@@ -22959,10 +23774,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Breyti vindmyllu"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Leiðsla"
@@ -22971,37 +23786,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Breyti leiðslu"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
+msgid "gas"
+msgstr ""
+
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr ""
+
+#: build/trans_presets.java:2353
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-msgid "gas"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr ""
@@ -23011,10 +23826,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Krani"
@@ -23022,21 +23837,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Breyti krana"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr ""
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr ""
@@ -23044,10 +23854,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "Eftirlitsmyndavél"
@@ -23055,11 +23865,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Breyti eftirlitsmyndavél"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "Rafall"
@@ -23069,35 +23891,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "Breyti rafli"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "Orkuver"
@@ -23106,10 +23928,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "Breyti orkuveri"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "Spennustöð"
@@ -23118,5 +23940,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "Breyti spennustöð"
@@ -23124,10 +23946,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr "Tilvísunarnúmer línunnar"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "Háspennustaur"
@@ -23138,23 +23960,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "Breyti háspennustaur"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "Raflína"
@@ -23163,79 +23985,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "Breyti raflínu"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr ""
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "Volt"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Salerni"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr "Athugasemd"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "Póstkassi"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Almenningssími"
@@ -23244,5 +24061,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Breyti almenningssíma"
@@ -23250,5 +24067,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Mynt"
@@ -23256,5 +24073,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "Athugasemd"
@@ -23262,5 +24079,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -23268,5 +24085,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr "Debetkort"
@@ -23274,15 +24091,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Símakort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Endurvinnsla"
@@ -23291,5 +24108,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Breyti endurvinnslustöð"
@@ -23297,63 +24114,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "Rafhlöður"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "Dósir"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "Föt"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "Gler"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "Pappír"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "Brotajárn"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+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:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr ""
@@ -23432,5 +24260,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -23440,31 +24268,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -23473,30 +24301,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "Hæð"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "Gosbrunnur"
@@ -23505,10 +24333,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "Breyti gosbrunn"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "Drykkjarvatn"
@@ -23517,10 +24345,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Breyti drykkjarvatni"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr "Barnalúga"
@@ -23528,15 +24369,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr "Breyti barnalúgu"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Verslanir"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr ""
@@ -23544,10 +24385,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "Breyti bílabúð"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr ""
@@ -23556,28 +24397,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "Breyti hjólabúð"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr ""
@@ -23585,9 +24426,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "Sjoppa"
@@ -23595,27 +24436,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "Breyti sjoppu"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr "Ferðaskrifstofa"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr "Breyti ferðaskrifstofu"
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "Sjálfsali"
@@ -23623,5 +24464,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr ""
@@ -23629,88 +24470,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "dagblöð"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "dót"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "Slátrari"
@@ -23718,9 +24559,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Breyti slátrara"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "Bakarí"
@@ -23728,9 +24569,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Breyti bakaríi"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "Blómabúð"
@@ -23738,18 +24579,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "Breyti blómabúð"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr "Lífræn búð"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr "Breyti lífrænni búð"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr ""
@@ -23757,54 +24598,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr "Vínbúð"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr "Tölvubúð"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "Breyti tölvubúð"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr "Raftækjabúð"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "Breyti raftækjabúð"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr "Hljómtækjaverslun"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr "Breyti hljómtækjaverslun"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr "Húsgagnaverslun"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "Breyti húsgagnaverslun"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr ""
@@ -23812,9 +24653,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr ""
@@ -23822,9 +24663,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -23832,54 +24673,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr "Skrifstofuvörur"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr "Breyti skrifstofuvörum"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "Hársnyrtir"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "Breyti hársnyrti"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr "Skóbúð"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "Breyti skóbúð"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr "Dótabúð"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "Breyti dótabúð"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Efnalaug"
@@ -23887,9 +24728,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Breyti efnalaug"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Þvottahús"
@@ -23897,9 +24738,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Breyti þvottahúsi"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr "Útivistarbúð"
@@ -23907,28 +24748,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr "Breyti útivistarbúð"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "Breyti sjóntækjasmið"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Fjármál"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Banki"
@@ -23936,14 +24777,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Breyti banka"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "Hraðbanki"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Gjaldeyrisskipti"
@@ -23951,5 +24792,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Breyti gjaldeyrisskiptum"
@@ -23957,15 +24798,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Breyti hraðbanka"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Heilsa"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "Læknir"
@@ -23973,18 +24814,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "Breyti lækni"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "Tannlæknir"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "Breyti tannlækni"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Apótek"
@@ -23992,5 +24833,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Apótek"
@@ -23998,9 +24839,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Spítali"
@@ -24008,10 +24849,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Breyti spítala"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr ""
@@ -24020,5 +24861,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -24027,20 +24868,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -24048,5 +24889,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "Dýralæknir"
@@ -24055,64 +24896,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "Breyti dýralækni"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr "Landafræði"
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Staðir"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Heimsálfa"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Breyti heimsálfu"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Breyti landi"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "Fylki"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "Breyti fylki"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "Svæði"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "Breyti svæði"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr "Sýsla"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr "Breyti sýslu"
@@ -24120,15 +24961,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "Borg"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "Breyti borg"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "Bær"
@@ -24136,10 +24977,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "Breyti bæ"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "Hverfi"
@@ -24147,25 +24988,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "Breyti hverfi"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Þorp"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Breyti þorpi"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "Smáþorp"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "Breyti smáþorpi"
@@ -24173,5 +25014,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr ""
@@ -24179,10 +25020,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "Eyja"
@@ -24190,10 +25031,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Breyti eyju"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr ""
@@ -24201,5 +25042,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr ""
@@ -24207,5 +25048,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "Hellismunni"
@@ -24213,10 +25054,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "Breyti hellismunna"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Tindur"
@@ -24224,10 +25065,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Breyti tind"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "Jökull"
@@ -24235,10 +25076,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "Breyti jökli"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "Eldfjall"
@@ -24246,70 +25087,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "Breyti eldfjalli"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Landamæri"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr ""
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr ""
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "Breyti landamærum þjóðgarðs"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Landnýting"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Tré"
@@ -24318,15 +25159,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Breyti tré"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "Fræðiheiti"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "Skógur"
@@ -24335,5 +25176,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "Breyti skóg"
@@ -24341,17 +25182,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "barrskógur"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "laufskógur"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "blandaður"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "Skógur (ræktaður)"
@@ -24360,14 +25201,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "Breyti ræktuðum skóg"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr ""
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -24375,25 +25216,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr ""
@@ -24401,10 +25242,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr ""
@@ -24412,5 +25253,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr ""
@@ -24418,5 +25259,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr ""
@@ -24425,45 +25266,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr ""
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -24471,25 +25312,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "Garður"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "Breyti garði"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr ""
@@ -24497,10 +25338,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr ""
@@ -24508,20 +25349,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "Almenningsgarður"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "Breyti almenningsgarð"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr ""
@@ -24529,5 +25370,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -24535,15 +25376,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "Íbúðarsvæði"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr "Breyti íbúðarlandnýtingu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "Grafreitur"
@@ -24551,9 +25392,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Breyti grafreit"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr ""
@@ -24561,39 +25402,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "Breyti kirkjugarðslandnýtingu"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "Smásala"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr "Breyti smásölulandnýtingu"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "Skrifstofur"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr "Breyti skrifstofulandnýtingu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "Iðnaður"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr "Breyti iðnaðarlandnýtingu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr ""
@@ -24601,15 +25442,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr ""
@@ -24617,50 +25458,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "Byggingarsvæði"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "Breyti byggingarsvæðislandnýtingu"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr ""
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr ""
@@ -24670,5 +25511,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr "Breyta marghyrningi"
@@ -24677,10 +25518,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr ""
@@ -24688,5 +25529,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr "Beygjutakmörkun"
@@ -24695,5 +25536,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr "Breyti beygjutakmörkun"
@@ -24701,34 +25542,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr "vinstri beygjur óleyfilegar"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr "hægri beygjur óleyfilegar"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr "óleyfilegt að halda beint áfrám"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr "óleyfilegt að taka U-beygju"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr "aðeins_beint_fram"
@@ -24737,15 +25578,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr "af vegi"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 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:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr "að vegi"
@@ -24753,5 +25594,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr ""
@@ -24760,5 +25601,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr ""
@@ -24766,5 +25607,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr ""
@@ -24855,5 +25696,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -24863,17 +25704,17 @@
 msgstr "hjól"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr ""
@@ -24933,5 +25774,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -24940,9 +25781,9 @@
 msgstr "fótgangandi"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr ""
@@ -24956,10 +25797,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr ""
@@ -24967,31 +25808,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr ""
@@ -25000,106 +25841,31 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 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 ""
 
@@ -25635,77 +26401,4 @@
 #: build/trans_style.java:975 build/trans_style.java:983
 msgid "highway_track"
-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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
 msgstr ""
 
@@ -29232,13 +29925,4 @@
 msgstr ""
 
-#~ msgid "Bridleway"
-#~ msgstr "Reiðstígur"
-
-#~ msgid "Cycleway"
-#~ msgstr "Hjólastígur"
-
-#~ msgid "Footway"
-#~ msgstr "Göngustígur"
-
 #~ msgid "Incorrect password or username."
 #~ msgstr "Rangt lykilorð eða notandanafn"
@@ -29344,4 +30028,10 @@
 #~ msgstr "Vertu viss um að láta eftirfarandi upplýsingar fylgja:"
 
+#~ msgid "Cycleway"
+#~ msgstr "Hjólastígur"
+
+#~ msgid "Footway"
+#~ msgstr "Göngustígur"
+
 #~ msgid "Delete the selected layer."
 #~ msgstr "Eyða völdu lagi."
@@ -29470,9 +30160,9 @@
 #~ "openstreetmap.org"
 
-#~ msgid "Public"
-#~ msgstr "Sýnilegur öllum"
-
 #~ msgid "Charge"
 #~ msgstr "Gjaldtaka"
+
+#~ msgid "Bridleway"
+#~ msgstr "Reiðstígur"
 
 #~ msgid "Edit Information Office"
Index: applications/editors/josm/i18n/po/it.po
===================================================================
--- applications/editors/josm/i18n/po/it.po	(revision 19689)
+++ applications/editors/josm/i18n/po/it.po	(revision 19698)
@@ -5,7 +5,7 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-19 00:01-0500\n"
-"PO-Revision-Date: 2010-01-18 23:39-0500\n"
-"Last-Translator: Davide Prade <davalv@alice.it>\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-30 12:46+0000\n"
+"Last-Translator: giardia <Unknown>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
 "MIME-Version: 1.0\n"
@@ -13,5 +13,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-01-13 18:25+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -67,11 +67,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -92,4 +92,5 @@
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
+"Il parametro \"downloadgps\" non accetta nomi di file o indirizzi URL di file"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:497
@@ -240,5 +241,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -252,13 +253,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -267,5 +268,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -291,5 +295,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Unisci"
@@ -319,5 +323,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -388,9 +392,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -398,5 +402,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "OK"
@@ -447,6 +453,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -464,5 +470,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -471,11 +477,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -512,5 +518,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "conflitto"
@@ -646,14 +652,14 @@
 msgstr "Selezionare almeno due percorsi da unire."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Copia"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Copia gli oggetti selezionati all''interno del buffer"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Seleziona qualcosa da copiare."
@@ -686,8 +692,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -696,5 +702,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -753,16 +759,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Ci sono stati {0} conflitti durante l''importazione"
-msgstr[1] "Ci sono stati {0} conflitti durante l''importazione"
+msgstr[0] "Si è verificato {0} conflitto durante l'importazione"
+msgstr[1] "Ci sono stati {0} conflitti durante l'importazione"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "Conflitti durante lo scaricamento"
-msgstr[1] "Conflitti durante lo scaricamento"
+msgstr[0] "Conflitto durante il download"
+msgstr[1] "Conflitti durante il download"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -783,4 +788,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -790,4 +797,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplica la selezione copiando ed incollalo subito."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Duplica percorso"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "Modifica la relazione correntemente selezionata"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "Livello: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "Ingrandisci visuale su {0}"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr ""
 
 #. <button label="Info" hotkey="I">
@@ -880,20 +915,21 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 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] "Il percorso selezionato non contiene il nodo selezionato."
-msgstr[1] "Il percorso selezionato non contiene tutti i nodi selezionati."
+msgstr[0] ""
+"La via selezionata ha nodi al di fuori dei dati scaricati della regione"
+msgstr[1] ""
+"Le vie selezionate hanno nodi al di fuori dei dati scaricati della regione"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68
 msgid "This can lead to nodes being deleted accidentally."
-msgstr ""
+msgstr "Ciò potrebbe portare alla cancellazione accidentale di nodi"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:156
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:69
 msgid "Are you really sure to continue?"
-msgstr ""
+msgstr "Sei realmente sicuro di proseguire?"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157
@@ -1008,5 +1044,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "Indirizzo URL"
@@ -1160,5 +1196,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+#, fuzzy
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr "<html>Impossibile aprire una cartella.<br>Selezionare un file!"
 
@@ -1172,9 +1209,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Apertura di {0} file..."
-msgstr[1] "Apertura di {0} file..."
+msgstr[0] "Aprendo {0} file..."
+msgstr[1] "Aprendo {0} files..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1230,7 +1267,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1244,5 +1281,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr ""
 "Sposta i nodi in modo che tutti gli angoli compresi siano di 90 o 270 gradi"
@@ -1285,4 +1323,9 @@
 "disattivare questo messaggio.<br>Continuare?</html>"
 
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+#, fuzzy
+msgid "Selection must consist only of ways and nodes."
+msgstr "Il multi-poligono deve consistere solamente in percorsi chiusi."
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
 msgid "Orthogonalize"
@@ -1297,4 +1340,16 @@
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "Gli elementi selezionati non possono essere ortogonalizzati"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr ""
+"Selezionare dei percorsi con gli angoli da ortogonalizzare quasi giusti."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1311,9 +1366,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151
 msgid "Delete incomplete members?"
-msgstr ""
+msgstr "Eliminare i membri incompleti?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152
 msgid "Paste without incomplete members"
-msgstr ""
+msgstr "Incolla senza i membri incompleti"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
@@ -1323,4 +1378,7 @@
 "incomplete primitives?"
 msgstr ""
+"I dati copiati contengono delle primitive incomplete.  Quando si incolla le "
+"primitive incomplete sono rimosse.  Si desidera incollare i dati senza le "
+"primitive incomplete?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
@@ -1353,5 +1411,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Open a preferences dialog for global settings."
-msgstr ""
+msgstr "Apre una finestra delle preferenze per i settaggi globali"
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
@@ -1400,18 +1458,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1436,12 +1494,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Errore"
@@ -1577,5 +1636,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1787,9 +1846,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "Duplica {0} nodi in {1} nodi"
-msgstr[1] "Duplica {0} nodi in {1} nodi"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1833,5 +1892,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr "Scarica dati"
@@ -2052,5 +2111,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:76
 msgid "Downloaded GPX Data"
-msgstr "Scarica dati GPX"
+msgstr "Dati GPX scaricati"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:82
@@ -2264,5 +2323,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:29
 msgid "Drag play head"
-msgstr ""
+msgstr "Trascina testina di riproduzione"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
@@ -2271,14 +2330,14 @@
 "+release to synchronize audio at that point."
 msgstr ""
-"Trascinare la testina e rilasciarla in prossimità di un tracciato per "
-"riprodurre l''audio da quel punto; premere SHIFT ed in contemporanea "
-"rilasciare il tasto del mouse per sincronizzare l''audio in corrispondenza "
-"di quel punto."
+"Trascinare la testina di riproduzione e rilasciarla in prossimità di un "
+"tracciato per riprodurre l'audio da quel punto; premere SHIFT ed in "
+"contemporanea rilasciare il tasto del mouse per sincronizzare l'audio in "
+"corrispondenza di quel punto."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2365,7 +2424,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
-#, fuzzy
 msgid "<not>"
-msgstr "nord"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
@@ -2378,7 +2436,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
-#, fuzzy
 msgid "<right parent>"
-msgstr "Parentesi chiusa mancante"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
@@ -2408,5 +2465,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Cerca degli oggetti."
@@ -2591,4 +2648,6 @@
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
+"Utilizza <b>\"</b> per delimitare gli operatori (es. se la chiave contiene "
+"<b>:</b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:144
@@ -2597,4 +2656,7 @@
 "escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
 msgstr ""
+"All'interno delle stringhe delimitate da virgolette i caratteri <b>\"</b> e "
+"<b>\\</b> devono essere preceduti  da <b>\\</b> (es. <b>\\\"</b> e <b>\\\\</"
+"b>)."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
@@ -2611,5 +2673,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Cerca"
@@ -2650,25 +2712,22 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "CS"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
-msgstr "CI"
+msgstr ""
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
-msgstr "RX"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2682,5 +2741,5 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2688,5 +2747,5 @@
 "etichetta. Esempio di utilizzo: key=value"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2710,7 +2769,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
-msgstr "Token inaspettato: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
@@ -2838,8 +2897,8 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "Aggiunti {0} oggetti"
+msgstr[0] "Aggiunto {0} oggetto"
 msgstr[1] "Aggiunti {0} oggetti"
 
@@ -2890,12 +2949,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "Rimuovi \"{0}\" per {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Imposta {0}={1} per {2} {3}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2961,17 +3020,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Modalità Cancella"
+msgstr "Cancella nodo {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Elimina {0} percorso"
+msgstr "Cancella percorso {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Elimina {0} relazione"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -3052,9 +3111,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "Epurati {0} oggetti"
-msgstr[1] "Epurati {0} oggetti"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -3104,24 +3163,24 @@
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "Undelete {0} primitive"
 msgid_plural "Undelete {0} primitives"
-msgstr[0] "Ripristina {0} primitive"
-msgstr[1] "Ripristina {0} primitive"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for node {0}"
-msgstr "Risolvi i conflitti di versione per il nodo {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for way {0}"
-msgstr "Risolvi i conflitti di versione per il percorso {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Risolvi i conflitti di versione per la relazione {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3377,5 +3436,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:140
 msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr ""
+msgstr "Attenzione: manca il file di revisione ''''/REVISION''''."
 
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:76
@@ -3399,5 +3458,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3405,5 +3464,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3411,5 +3470,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3417,5 +3476,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3488,8 +3547,7 @@
 #. column header: hide filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
-#, fuzzy
 msgctxt "filter"
 msgid "H"
-msgstr "H"
+msgstr ""
 
 #. column header: filter text
@@ -3501,67 +3559,60 @@
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "C"
+msgstr ""
 
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
-#, fuzzy
 msgctxt "filter"
 msgid "I"
-msgstr "I"
+msgstr ""
 
 #. column header: filter mode
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
-#, fuzzy
 msgctxt "filter"
 msgid "M"
-msgstr "M"
+msgstr ""
 
 #. translators notes must be in front
 #. filter mode: replace
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210
-#, fuzzy
 msgctxt "filter"
 msgid "R"
-msgstr "R"
+msgstr ""
 
 #. filter mode: add
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211
-#, fuzzy
 msgctxt "filter"
 msgid "A"
-msgstr "A"
+msgstr ""
 
 #. filter mode: remove
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212
-#, fuzzy
 msgctxt "filter"
 msgid "D"
-msgstr "D"
+msgstr ""
 
 #. filter mode: in selection
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213
-#, fuzzy
 msgctxt "filter"
 msgid "F"
-msgstr "F"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Una primitiva con ID = 0 non può essere invisibile."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "Era atteso un ID > 0 . Ottenuto {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "attesa versione > 0 . Ottenuto {0}."
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3572,5 +3623,5 @@
 "nuova primitiva. Il valore dell''identificativo del gruppo di modifiche è {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3578,5 +3629,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3705,6 +3756,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3714,5 +3765,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3723,7 +3774,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3745,5 +3796,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "sfondo"
@@ -3891,6 +3942,6 @@
 msgstr "Non visualizzare nuovamente (ricorda la scelta)"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3898,37 +3949,38 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "incompleto"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "strada"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "ferrovia"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "corso d''acqua"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "tipologia di area"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3937,10 +3989,10 @@
 msgstr[1] "{0} nodi"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr "trasporto pubblico"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3949,5 +4001,5 @@
 msgstr[1] "{0} membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3984,6 +4036,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Conflitto"
@@ -3994,8 +4046,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-msgid "Authorization Failed"
+msgid "Authorisation Failed"
 msgstr "Autorizzazione fallita"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
+#, fuzzy
 msgid "Authentication failed"
 msgstr "Autenticazione fallita"
@@ -4138,4 +4191,5 @@
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
+"Apre un file (qualunque tipo di file che possa essere aperto con File/Apri)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
@@ -4147,4 +4201,6 @@
 msgid "Download the location at the url (with lat=x&lon=y&zoom=z) as raw gps"
 msgstr ""
+"Scarica la posizione all'indirizzo url (con lat=x&lon=y&zoom=z) come punti "
+"gps grezzi"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:82
@@ -4162,5 +4218,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Set the language"
-msgstr ""
+msgstr "Imposta la lingua"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
@@ -4183,4 +4239,8 @@
 "megabytes"
 msgstr ""
+"nota: Per alcuni compiti JOSM ha bisogno di una cospicua quantità di "
+"memoria. Potrebbe essere necessario aggiungere le seguenti\n"
+"      opzioni Java per specificare la dimensione massima della memoria "
+"allocata (in megabyte)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
@@ -4197,7 +4257,7 @@
 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:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Inizializzazione"
@@ -4205,9 +4265,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
 msgid "Updating plugins..."
-msgstr ""
+msgstr "Aggiornando plugins..."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:176
 msgid "Installing updated plugins"
-msgstr ""
+msgstr "Installando plugins aggiornati"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:180
@@ -4240,5 +4300,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4249,5 +4309,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Modifica"
@@ -4318,29 +4378,29 @@
 msgstr "scala"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "La longitudine 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 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:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "La latitudine geografica del puntatore del mouse."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 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:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 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:106
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 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:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4351,9 +4411,9 @@
 "mouse.<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(nessun oggetto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4522,16 +4582,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Etichette({0} conflitti)"
-msgstr[1] "Etichette({0} conflitti)"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "{0} pending tag conflict to be resolved"
 msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} conflitti di etichette in attesa di risoluzione"
-msgstr[1] "{0} conflitti di etichette in attesa di risoluzione"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
@@ -4590,16 +4650,16 @@
 msgstr "Risoluzione conflitto"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr "la lista nel ruolo {0} attualmente non partecipa ad alcun confronto"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "valore inaspettato per il parametro \"index\". Ottenuto {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4821,9 +4881,14 @@
 msgstr "Nodo"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 "L''unione dei nodi non è stata ancora bloccata. Non è possibile costruire il "
 "comando di risoluzione"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4851,5 +4916,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional node used by way {1}<br>which is deleted on the "
@@ -4859,9 +4924,5 @@
 "server.<br><br>Do you want to undelete these nodes too?"
 msgstr[0] ""
-"<html>Ci sono {0} nodi aggiuntivi usati dalla via {1}<br>che sono stati "
-"cancellati sul server.<br><br>Vuoi recuperare anche questi nodi?</html>"
 msgstr[1] ""
-"<html>Ci sono {0} nodi aggiuntivi usati dalla via {1}<br>che sono stati "
-"cancellati sul server.<br><br>Vuoi recuperare anche questi nodi?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
@@ -4870,5 +4931,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional primitive referred to by relation {1}<br>which is "
@@ -4878,9 +4939,5 @@
 "deleted on the server.<br><br>Do you want to undelete these too?"
 msgstr[0] ""
-"<html>Ci sono {0} primitive addizionali collegate alla relazione {1}<br>che "
-"sono state eliminate sul server.<br><br>Si desidera ripristinarle?</html>"
 msgstr[1] ""
-"<html>Ci sono {0} primitive addizionali collegate alla relazione {1}<br>che "
-"sono state eliminate sul server.<br><br>Si desidera ripristinarle?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
@@ -4984,5 +5041,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr "No, annulla"
@@ -5033,5 +5090,10 @@
 msgstr "Primitiva"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -5170,10 +5232,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "nessuno"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "tutti"
@@ -5257,7 +5319,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -5267,6 +5329,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5368,4 +5430,11 @@
 "the place of the original node in the relation.</html>"
 msgstr ""
+"<html>I nodi uniti compaiono come membri in una o più relazioni. Si prega di "
+"decidere se si vuole <strong>mantenere</strong> queste appartenenze per il "
+"nodo di destinazione o se invece si desidera <strong>eliminarle</strong>."
+"<br>Il comportamento predefinito è quello di <strong>mantenere</strong> il "
+"primo nodo ed <strong>eliminare</strong> gli altri nodi che sono membri "
+"della stessa relazione: il nodo di destinazione prenderà il posto del nodo "
+"originale nella relazione.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
@@ -5471,10 +5540,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5494,13 +5563,13 @@
 msgstr "Pila dei comandi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr "Risolvi i conflitti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Risolvi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
@@ -5508,6 +5577,6 @@
 "sopra."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5540,5 +5609,5 @@
 "<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.Click <strong>{0}</strong> to close anyway."
+"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.</"
@@ -5564,5 +5633,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5571,5 +5640,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5649,43 +5718,48 @@
 msgstr "Visualizza lo storico degli oggetti selezionati."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Livelli"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 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:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr "Elimina i livelli selezionati."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Mostra/Nascondi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr "Attiva"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr "Attiva il livello selezionato"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr "Unisci questo livello con un altro livello"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Duplica percorso"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 msgid "Move the selected layer one row up."
 msgstr "Sposta il livello selezionato in su."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Sposta il layer selezionato in giù."
@@ -5699,6 +5773,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Relazioni"
@@ -5708,22 +5782,22 @@
 msgstr "Apri una lista di tutte le relazioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relazioni: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Apri le relazioni selezionate in un editor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Cancella le relazioni selezionate"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Crea una nuova relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
@@ -5732,47 +5806,47 @@
 "dell''editor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr "Imposta la selezione corrente con la lista delle relazioni selezionate"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr "Seleziona i membri di tutte le relazioni selezionate"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr "Seleziona membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr "Scarica tutti i membri delle relazioni selezionate"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr "Scarica membri"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Selezione corrente"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Apri una finestra con la lista delle selezioni."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Ingrandisci la visuale sugli elementi selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Ingrandisci visuale sulla selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sel.: Rel.:{0}/Percorsi:{1}/Nodi:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5780,5 +5854,5 @@
 msgstr "Selezione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -6151,8 +6225,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -6224,4 +6296,7 @@
 #. <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 />
@@ -6300,6 +6375,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6341,6 +6417,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6809,152 +6887,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Nome"
@@ -7369,5 +7449,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:174
 msgid "This changeset query URL is invalid"
-msgstr "L''URL per l''interrogazione sui changesets non è valido"
+msgstr ""
+"L'indirizzo URL per l'interrogazione sui gruppi di modifiche non è valido"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:181
@@ -7386,5 +7467,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<diverso>"
@@ -7439,55 +7520,55 @@
 msgstr "Aggiungi proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Proprietà: {0} / Appartenenze: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Proprietà / Appartenenze"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Cambia relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "Elimina dalla relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Vuoi veramente cancellare la selezione dalla relazione {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Cancella la chiave selezionata in tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "Elimina proprietà"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Aggiungi una nuova coppia chiave/valore a tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Modifica il valore della chiave selezionata per tutti gli oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr "Selezionare la relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr "Selezionare la relazione nella selezione principale"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr "Seleziona nella lista delle relazioni"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr "Selezionare la relazione nella lista delle relazioni"
@@ -7525,9 +7606,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1093
-#, fuzzy
 msgid "Conflict in data"
 msgid_plural "Conflicts in data"
 msgstr[0] "Conflitto nei dati"
-msgstr[1] "Conflitto nei dati"
+msgstr[1] "Conflitti nei dati"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:345
@@ -7853,7 +7933,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
-#, fuzzy
 msgid "Do you really want to apply the new role?"
-msgstr "Si vuole permettere questo?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
@@ -7958,10 +8037,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr ""
-"Attenzione: eccezione ignorata perché il lavoro è stato annullato. "
-"L''eccezione è stata: "
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
@@ -7983,31 +8060,31 @@
 "relazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Segnalibri"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr "<html>Non è stata selezionata nessuna area di scarico.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+#, fuzzy
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
 msgstr ""
 "<html><strong>Area di scarico corrente</strong> (minlat,minlon, maxlat, "
 "maxlon): {0}, {1}, {2}, {3}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr "Crea segnalibro"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:185
 msgid "Add a bookmark for the currently selected download area"
 msgstr ""
 "Aggiungi un segnalibro per l''area di scarico correntemente selezionata"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:192
 msgid ""
 "Currently, there is no download area selected. Please select an area first."
@@ -8016,19 +8093,19 @@
 "un''area."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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 "Inserire un nome per il segnalibro dell''area di scarico."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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 "Nome della posizione"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:217
 msgid "Remove the currently selected bookmarks"
 msgstr "Rimuovi i segnalibri correntemente selezionati"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr "Rinomina i segnalibri correntemente selezionati"
@@ -8163,18 +8240,18 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr "Tipo della classe"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr "Confini"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr "Vicino a"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -8185,34 +8262,34 @@
 msgstr "Selezionare il server per la ricerca:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
 msgid "Enter a place name to search for:"
 msgstr "Inserire il nome di un luogo da cercare:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:112
 msgid "Enter a place name to search for"
 msgstr "Inserire il nome di una località da ricercare"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:148
 msgid "Areas around places"
 msgstr "Aree attorno le località"
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Eccezione del puntatore nullo, è probabile che manchino alcuni tag."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr "Cerca ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr "Cliccare per iniziare la ricerca delle località"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr "Interrogazione del server dei nomi"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr "Interrogazione del server dei nomi ..."
@@ -8223,7 +8300,9 @@
 #. 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" />
@@ -8232,10 +8311,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Tipo"
@@ -8244,5 +8324,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -8254,17 +8334,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "sconosciuto"
@@ -8403,8 +8482,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511
-#, fuzzy, java-format
+#, java-format
 msgid "Warning: bad location in HTML document. Exception was: {0}"
 msgstr ""
-"Attenzione: posizione errata nel documento HTML. L''eccezione è stata: "
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561
@@ -8661,5 +8739,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr "Rilevati conflitti"
@@ -8762,4 +8840,6 @@
 "the changeset after the next upload."
 msgstr ""
+"Si prega di decidere su quale gruppo di modifiche i dati saranno caricati e "
+"se chiudere lo stesso dopo il prossimo caricamento."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:87
@@ -8917,4 +8997,8 @@
 "working."
 msgstr ""
+"Impossibile recuperare la lista dei tuoi changesets aperti poichè<br>JOSM "
+"non riconosce la tua identità.<br>Potresti aver scelto di lavorare anonimo, "
+"oppure non ti è permesso<br>conoscere l'identità dell'utente per il quale "
+"stai lavorando."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:68
@@ -9060,5 +9144,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>{0} layer needs saving but has an associated file<br>which cannot be "
@@ -9070,13 +9154,5 @@
 "changes.<br>Layers with non-writable files:</html>"
 msgstr[0] ""
-"<html>{0} livello ha la necessità di essere salvato ma possiede un file "
-"associato<br>che non può essere scritto.<br>Selezionare un altro file per "
-"questo livello oppure scartare le modifiche.<br>Livello con un file non-"
-"scrivibile:</html>"
 msgstr[1] ""
-"<html>{0} livelli hanno la necessità di essere salvati ma posseggono dei "
-"file associati<br>che non possono essere scritti.<br>Selezionare un altro "
-"file per ognuno di essi oppure scartare le modifiche.<br>Livelli con file "
-"non-scrivibili:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
@@ -9130,5 +9206,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -9138,9 +9214,5 @@
 "cancelled or have failed.</html>"
 msgstr[0] ""
-"<html>Una operazione di caricamento e/o salvataggio di un livello con "
-"modifiche<br>è stata annullata oppure è fallita.</html>"
 msgstr[1] ""
-"<html>Una operazione di caricamento e/o salvataggio di un livello con "
-"modifiche<br>è stata annullata oppure è fallita.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500
@@ -9163,9 +9235,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -9175,7 +9247,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -9187,16 +9259,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "Layer"
@@ -9345,5 +9417,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:58
 msgid "configure changeset"
-msgstr ""
+msgstr "configura gruppo di modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:80
@@ -9386,5 +9458,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:101
 msgid "advanced configuration"
-msgstr ""
+msgstr "configurazione avanzata"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:97
@@ -9674,68 +9746,68 @@
 msgstr[1] "{0} oggetti da eliminare:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "punto GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Personalizza disegno linee"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../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:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Personalizza colori"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Predefinito"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Scegli un colore"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr "Crea marcatori dai punti con nome"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Nomina i punti del percorso da {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Importa l''audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9748,23 +9820,23 @@
 "possibile correlarli con la traccia audio.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr "Importazione non possibile"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Files audio Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcatori audio da {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Importa immagini"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9777,5 +9849,5 @@
 "possibile correlarli con le immagini.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9783,5 +9855,5 @@
 msgstr "Nome: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9789,5 +9861,5 @@
 msgstr "Descrizione: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9797,23 +9869,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "Descrizione"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr "Differenza temporale"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr "Lunghezza"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Lunghezza: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9822,5 +9894,5 @@
 msgstr[1] "{0} percorsi, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9829,10 +9901,10 @@
 msgstr[1] "{0} punti del percorso"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Converti in livello dati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9843,43 +9915,43 @@
 "tracciati, vedere qui:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Convertito da: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "Scarica da OSM lungo questo tracciato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Scarica tutto entro:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "Area massima per richiesta:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km quadrati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9890,9 +9962,9 @@
 "vuole procedere?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 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:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9903,5 +9975,5 @@
 "all''inizio."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9911,19 +9983,19 @@
 "tracciato per poter essere giustamente calcolati."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Livello dati {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "al di fuori dell''area scaricata"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr "versione {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
@@ -9931,5 +10003,5 @@
 "nella versione 0.5"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9938,5 +10010,5 @@
 msgstr[1] "Sono stati individuati {0} conflitti."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9956,5 +10028,5 @@
 "server."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9971,11 +10043,11 @@
 "conflitti e risolverli manualmente."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 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:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9984,32 +10056,32 @@
 msgstr[1] "{0} eliminati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} è composto da:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr "disattiva"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr "Versione delle API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Converti in un layer GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr "Controllo consistenza dell'insieme dei dati"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr "Nessun problema trovato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr "Sono stati trovati i seguenti problemi:"
@@ -10059,28 +10131,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "Punti GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "File GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, 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:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Impossibile interpretare {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Impossibile leggere \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10092,34 +10163,34 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr "Ora di scatto della fotografia (dai dati exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 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:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [gg/mm/aaaa hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr "Mi trovo nel fuso orario di: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "Nessuna data"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr "Apri un''altra fotografia"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 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:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -10129,21 +10200,21 @@
 "Si prega di usare il formato richiesto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "Data non valida"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr "<Nessun tracciato GPX ancora caricato>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr "Tracciato GPX: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr "Apri un altro tracciato GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 msgid ""
 "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
@@ -10152,43 +10223,43 @@
 "del ricevitore GPS</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr "Regolazione manuale"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr "Sovrapposizione per: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, 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:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, 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:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 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:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr "Fuso orario: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr "Scostamento:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr "Nessun tracciato gpx selezionato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -10198,45 +10269,45 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr "Correla le immagini al tracciato GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr "Correla"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr "Fuso orario non valido"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr "Compensazione non valida"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr "Riprova"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr "Non è stato possibile correlare alcuna immagine!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Fuso orario: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuti: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Secondi: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10245,5 +10316,5 @@
 msgstr[1] "Differenza temporale di {0} giorni"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10254,21 +10325,21 @@
 "manualmente le foto."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 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:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr "Regola fuso orario e differenza"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 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:951
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 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:979
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10278,17 +10349,17 @@
 "Selezionarne un altro."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 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:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr "Selezionare un tracciato GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr "Nessun tracciato GPX selezionato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -10299,5 +10370,5 @@
 "Formato atteso: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -10308,75 +10379,75 @@
 "Formato atteso: {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "Estrazione delle localizzazioni GPS dagli EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr "Inizio analisi cartella"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 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:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "Lettura delle foto ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Lettura di {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, 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:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Analisi cartella {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, 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:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, 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:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Immagini georeferenziate"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr "Correlazione ai dati GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "{0} nodi intermedi."
-msgstr[1] "{0} nodi intermedi."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
+#, java-format
 msgid "{0} was found to be GPS tagged."
 msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] "{0} sono stati trovati etichettati dal gps"
-msgstr[1] "{0} sono stati trovati etichettati dal gps"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr "Elimina il file immagine dal disco"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -10387,5 +10458,5 @@
 "definitivamente perduto!</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr "Il file dell''immagine non può essere eliminato."
@@ -10482,5 +10553,5 @@
 msgstr "segnaposto gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10488,5 +10559,5 @@
 msgstr[1] "marcatori"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10495,29 +10566,29 @@
 msgstr[1] "{0} è composto da {1} marcatori"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "Sincronizza l''audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 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:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr "Audio sincronizzato al punto {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
-msgstr "Esegui il marcatore audio all''inizio del brano"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+msgstr "Crea marcatore audio in prossimità della testina di riproduzione"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -10525,17 +10596,17 @@
 msgstr "Premi pausa nel punto del tracciato dove vuoi il marcatore"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 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:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Mostra/Nascondi testo/icone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 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:171
+#: ../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 "
@@ -10546,13 +10617,13 @@
 "(dopo il primo marcatore)."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 ""
-"Sposta (premendo SHIFT) l''inizio dell''audio sopra un marcatore audio o sul "
-"tracciato da sincronizzare."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+"Trascina (premendo SHIFT) la testina di riproduzione sopra un marcatore "
+"audio o sul tracciato da sincronizzare."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "Impossibile creare un nuovo segnaposto Audio"
@@ -10578,19 +10649,15 @@
 msgstr "Stile di tratteggio non valido, almeno un valore deve essere > 0"
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
+#, java-format
 msgid ""
 "Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
 msgstr ""
-"Attenzione: fallita la lettura del messaggio del giorno da ''''{0}''''. "
-"L''eccezione è stata: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
-#, fuzzy, java-format
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
+#, java-format
 msgid ""
 "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
 msgstr ""
-"Attenzione: fallita la lettura del messaggio del giorno da ''''{0}''''. "
-"L''eccezione è stata: {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
@@ -10598,5 +10665,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:233
 msgid "Access Token Key:"
-msgstr ""
+msgstr "Chiave del token di accesso:"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:49
@@ -10604,9 +10671,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
 msgid "Access Token Secret:"
-msgstr ""
+msgstr "Codice segreto del token di accesso:"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
 msgid "Save Access Token in preferences"
-msgstr ""
+msgstr "Salva token di accesso nelle preferenze"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
@@ -10615,4 +10682,7 @@
 "to use the Access Token in this JOSM session only.</html>"
 msgstr ""
+"<html>Selezionare per salvare il token di accesso nelle preferenze di JOSM."
+"<br>Deselezionare per utilizzare il token di accesso solamente in questa "
+"sessione di JOSM.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49
@@ -10622,31 +10692,33 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
 msgid "Consumer Key:"
-msgstr ""
+msgstr "Chiave dell'utilizzatore:"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
 msgid "Consumer Secret:"
-msgstr ""
+msgstr "Codice segreto dell'utilizzatore:"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
 msgid "Request Token URL:"
-msgstr ""
+msgstr "Indirizzo URL del token di richiesta:"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:89
 msgid "Access Token URL:"
-msgstr ""
+msgstr "Indirizzo URL del token di accesso:"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
 msgid "Authorize URL:"
-msgstr "Autorizza adesso"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
 msgid "Click to reset the OAuth settings to default values"
 msgstr ""
+"Cliccare per ripristinare i valori predefiniti delle impostazioni OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131
 msgid "Click to abort resetting to the OAuth default values"
 msgstr ""
+"Cliccare per annullare il ripristino delle impostazioni OAuth con i valori "
+"predefiniti"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
@@ -10655,8 +10727,10 @@
 "current custom settings are not saved.</html>"
 msgstr ""
+"<html>JOSM sta per ripristinare i valori predefiniti delle impostazioni "
+"OAuth.<br>Le impostazioni personalizzate correnti non sono salvate.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141
 msgid "Overwrite custom OAuth settings?"
-msgstr ""
+msgstr "Sovrascrivere le impostazioni OAuth personalizzate?"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:58
@@ -10688,4 +10762,9 @@
 "submitted by JOSM.</html>"
 msgstr ""
+"<html>Avvia una procedura semi-automatica per ottenere un token di accesso "
+"dal sito web di OSM.<br>JOSM invia le normali richieste OAuth per ottenere "
+"un token di richiesta e un<br>token di accesso. Invia l'utente al sito web "
+"di OSM tramite un browser esterno<br>per autenticarsi e per accettare il "
+"token di richiesta inviato da JOSM.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:88
@@ -10694,4 +10773,6 @@
 "outside<br>of JOSM.</html>"
 msgstr ""
+"<html>Inserire manualmente un token di accesso se è stato generato ed "
+"ottenuto al di fuori<br>di JOSM.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:112
@@ -10707,14 +10788,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:175
 msgid "Granted rights"
-msgstr ""
+msgstr "Diritti concessi"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:176
 msgid "Advanced OAuth properties"
-msgstr ""
+msgstr "Proprietà OAuth avanzate"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:236
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:357
 msgid "Accept Access Token"
-msgstr ""
+msgstr "Accetta il token di accesso"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:237
@@ -10751,5 +10832,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
 msgid "Test Access Token"
-msgstr ""
+msgstr "Verifica il token di accesso"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:409
@@ -10792,7 +10873,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
-#, fuzzy
 msgid "OAuth authorization failed"
-msgstr "Autorizzazione fallita"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
@@ -10812,4 +10892,8 @@
 "<br><br>Please check username and password and try again.</html>"
 msgstr ""
+"<html>E'' fallito il processo automatico per l''ottenimento di un token di "
+"accesso OAuth<br>dal server di OSM. JOSM non è riuscito ad accedere a {0}"
+"<br>con l''utente {1}.<br><br>Si prega di controllare il nome utente e la "
+"password e di riprovare.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:58
@@ -10822,21 +10906,21 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:97
 msgid "Save Access Token to preferences"
-msgstr ""
+msgstr "Salva il token di accesso nelle preferenze"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:118
 msgid "Access Token"
-msgstr ""
+msgstr "Token di accesso"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:119
 msgid "Advanced OAuth parameters"
-msgstr ""
+msgstr "Parametri OAuth avanzati"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:121
 msgid "Enter the OAuth Access Token"
-msgstr ""
+msgstr "Inserire il token di accesso OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:122
 msgid "Enter advanced OAuth properties"
-msgstr ""
+msgstr "Inserire le proprietà avanzate OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:139
@@ -10849,5 +10933,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:177
 msgid "Please enter an Access Token Key"
-msgstr ""
+msgstr "Si prega di inserire una chiave per il token di accesso"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:179
@@ -10855,8 +10939,10 @@
 "The Access Token Key must not be empty. Please enter an Access Token Key"
 msgstr ""
+"La chiave del token di accesso non può essere vuota. Si prega di inserire "
+"una chiave per il token di accesso"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:197
 msgid "Please enter an Access Token Secret"
-msgstr ""
+msgstr "Si prega di inserire un codice segreto per il token di accesso"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:199
@@ -10865,9 +10951,11 @@
 "Secret"
 msgstr ""
+"Il codice segreto del token di accesso non può essere vuoto. Si prega di "
+"inserire un codice segreto per il token di accesso"
 
 #: ../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 "Cliccare per verificare il token di accesso"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
@@ -10878,5 +10966,5 @@
 #, java-format
 msgid "Get an Access Token for ''{0}''"
-msgstr ""
+msgstr "Ottieni un token di accesso per ''''{0}''''"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
@@ -10886,5 +10974,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
 msgid "Close the dialog and accept the Access Token"
-msgstr ""
+msgstr "Chiudi la finestra ed accetta il token di accesso"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:99
@@ -10892,15 +10980,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:105
 msgid "Warning: failed to cancel running OAuth operation"
-msgstr ""
+msgstr "Attenzione: fallito l'annullamento dell'operazione OAuth in esecuzione"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:129
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
-msgstr ""
+msgstr "Ottenimento del token di richiesta OAuth da ''''{0}''''"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:162
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
-msgstr ""
+msgstr "Ottenimento del token di accesso OAuth da ''''{0}''''"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:299
@@ -10913,4 +11001,6 @@
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
+"Fallita l''autenticazione dell''utente ''''{0}'''' con la password "
+"''''***'''' come utente OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437
@@ -10920,7 +11010,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr "Inizializzazione della sessione sul sito web OSM..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:486
@@ -10934,7 +11024,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498
-#, fuzzy, java-format
+#, java-format
 msgid "Authorizing request token ''{0}''..."
-msgstr "Disconnessione della sessione ''''{0}''''..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:504
@@ -10945,21 +11035,23 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
 msgid "Allow to upload map data"
-msgstr ""
+msgstr "Permetti il caricamento dei dati della mappa"
 
 #: ../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 ""
+"Selezionare per permettere a JOSM di caricare i dati della mappa a tuo nome"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
 msgid "Allow to upload GPS traces"
-msgstr ""
+msgstr "Permetti il caricamento di tracciati 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 ""
+"Selezionare per permettere a JOSM di caricare i tracciati GPS a tuo nome"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
 msgid "Allow to download your private GPS traces"
-msgstr ""
+msgstr "Permetti lo scaricamento dei propri tracciati GPS privati"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
@@ -10968,24 +11060,30 @@
 "layers"
 msgstr ""
+"Selezionare per permettere a JOSM di scaricare i propri tracciati GPS "
+"privati nei livelli JOSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
 msgid "Allow to read your preferences"
-msgstr ""
+msgstr "Permetti la lettura delle preferenze personali"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
 msgid "Select to grant JOSM the right to read your server preferences"
 msgstr ""
+"Selezionare per permettere a JOSM di leggere le preferenze personali del "
+"server"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
 msgid "Allow to write your preferences"
-msgstr ""
+msgstr "Permetti la scrittura delle preferenze personali"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
 msgid "Select to grant JOSM the right to write your server preferences"
 msgstr ""
+"Selezionare per permettere a JOSM di scrivere le preferenze personali del "
+"server"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
 msgid "Retrieving OAuth Access Token..."
-msgstr ""
+msgstr "Ottenimento del token di accesso OAuth..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:70
@@ -10993,13 +11091,15 @@
 msgid "<html>Retrieving an OAuth Access Token from ''{0}'' failed.</html>"
 msgstr ""
+"<html>Fallito l''ottenimento di un token di accesso OAuth da ''''{0}''''.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
 msgid "Request Failed"
-msgstr ""
+msgstr "Richiesta fallita"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
 msgid "Retrieving OAuth Request Token..."
-msgstr ""
+msgstr "Ottenimento di un token di richiesta OAuth..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:64
@@ -11007,14 +11107,16 @@
 msgid "<html>Retrieving an OAuth Request Token from ''{0}'' failed.</html>"
 msgstr ""
+"<html>Fallito l''ottenimento di un token di richiesta OAuth da ''''{0}''''.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:130
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
 msgid "Display Advanced OAuth Parameters"
-msgstr ""
+msgstr "Visualizza i parametri avanzati 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 ""
+msgstr "Ottieni un token di richiesta"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:163
@@ -11024,8 +11126,10 @@
 "Token from ''{1}''.</html>"
 msgstr ""
+"<html>Si prega di cliccare su <strong>{0}</strong> per ottenere un token di "
+"richiesta OAuth da ''''{1}''''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:182
 msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
-msgstr ""
+msgstr "<html>Passo 1/3: Ottieni un token di richiesta OAuth</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:205
@@ -11035,5 +11139,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:228
 msgid "Request Access Token"
-msgstr ""
+msgstr "Richiedi un token di accesso"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:220
@@ -11052,9 +11156,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:349
 msgid "Go back to step 1/3"
-msgstr ""
+msgstr "Ritorna al passo 1/3"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:292
 msgid "<html>Step 3/3: Successfully retrieved an Access Token</html>"
-msgstr ""
+msgstr "<html>Passo 3/3: Token di accesso ottenuto con successo</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:306
@@ -11071,17 +11175,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:371
 msgid "Click to retrieve a Request Token"
-msgstr ""
+msgstr "Cliccare per ottenere un token di richiesta"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:402
 msgid "Retrieve Access Token"
-msgstr ""
+msgstr "Ottieni un token di accesso"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:404
 msgid "Click to retrieve an Access Token"
-msgstr ""
+msgstr "Cliccare per ottenere un token di accesso"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
 msgid "Testing OAuth Access Token"
-msgstr ""
+msgstr "Verifica del token di accesso OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:117
@@ -11089,4 +11193,6 @@
 msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
 msgstr ""
+"E'' stato rifiutato l''ottenimento dei dettagli utente con chiave del token "
+"di accesso ''''{0}''''."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
@@ -11135,5 +11241,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
 msgid "Token allows restricted access"
-msgstr ""
+msgstr "Il token permette l'accesso ristretto"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
@@ -11152,7 +11258,8 @@
 "''{1}''.<br>The token ist probably invalid.</html>"
 msgstr ""
+"<html>Fallita la firma della richiesta per il server OSM ''''{0}'''' con il "
+"token ''''{1}''''.<br>Probabilmente il token non è valido.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
-#, fuzzy
 msgid ""
 "<html>The test failed because the server responded with an internal error."
@@ -11160,11 +11267,8 @@
 "</html>"
 msgstr ""
-"<html>Il server OSM<br>''''{0}''''<br>ha riportato un errore interno al "
-"server.<br>Solitamente questo è un problema temporaneo. Riprovare più tardi."
-"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
 msgid "Retrieving user info..."
-msgstr ""
+msgstr "Ottenimento delle informazioni utente..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
@@ -11199,5 +11303,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Scegli la riga da modificare."
@@ -11211,5 +11315,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -11369,9 +11473,4 @@
 msgstr "Stile di disegno {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "Livello: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -11401,6 +11500,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr "Tutti"
@@ -11440,8 +11539,8 @@
 msgstr "Singolo colore (può essere personalizzato per i livelli con nome)"
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Automobile"
@@ -11463,13 +11562,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Bicicletta"
@@ -11502,12 +11601,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "Pedone"
@@ -11760,5 +11859,8 @@
 msgid_plural "The following {0} plugins have been downloaded successfully:"
 msgstr[0] ""
+"E' stata scaricata con <strong>successo</strong> la seguente estensione:"
 msgstr[1] ""
+"Sono state scaricate con <strong>successo</strong> le seguenti {0} "
+"estensioni:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:81
@@ -11768,13 +11870,15 @@
 "Downloading the following {0} plugins has <strong>failed</strong>:"
 msgstr[0] ""
+"E' <strong>fallito</strong> lo scaricamento della seguente estensione:"
 msgstr[1] ""
+"E'' <strong>fallito</strong> lo scaricamento delle seguenti {0} estensioni:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:114
 msgid "Search:"
-msgstr ""
+msgstr "Cerca:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:119
 msgid "Enter a search expression"
-msgstr ""
+msgstr "Inserire una espressione di ricerca"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:172
@@ -11806,9 +11910,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:296
 msgid "Download list"
-msgstr ""
+msgstr "Scarica lista"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:297
 msgid "Download the list of available plugins"
-msgstr ""
+msgstr "Scarica la lista delle estensioni disponibili"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:326
@@ -11824,13 +11928,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:327
 msgid "Update the selected plugins"
-msgstr ""
+msgstr "Aggiorna le estensioni selezionate"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:379
 msgid "Configure sites..."
-msgstr ""
+msgstr "Configura siti..."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:380
 msgid "Configure the list of sites where plugins are downloaded from"
-msgstr ""
+msgstr "Configura la lista dei siti da dove sono scaricate le estensioni"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:52
@@ -11869,5 +11973,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
-#, fuzzy
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11883,17 +11986,4 @@
 "keyboard...</p>"
 msgstr ""
-"<p>Si può notare che nella lista di selezione dei tasti nella prossima "
-"pagina sono elencati tutti i tasti che sono presenti in tutte le tipologie "
-"di tastiera riconosciute da Java, e non solamente i tasti presenti sulla "
-"propria tastiera specifica. Si invita pertanto ad usare solamente quei "
-"valori che corrispondono a un tasto reale della propria tastiera. Se, ad "
-"esempio, la propria tastiera non possiede un tasto ''Copia'' (le tastiere "
-"dei PC non ce l''hanno, mentre quelle della Sun si), non usarlo. Ci saranno "
-"anche dei ''tasti'' elencati che corrispondono ad una scorciatoia sulla "
-"propria tastiera (ad es. '':''/Doppio punto). Si invita a non usare neanche "
-"questi; usare piuttosto il tasto base ('';''/Punto e virgola su tastiere US, "
-"''.''/Punto su tastiere italiane, ...). Se non si seguono queste indicazioni "
-"ci potrebbero essere dei conflitti, così come non c''è modo per JOSM di "
-"sapere che Ctrl+Shift+; e Ctrl+: su tastiere US sono la stessa cosa...</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
@@ -11996,9 +12086,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
 msgid "Close the preferences dialog and discard preference updates"
-msgstr ""
+msgstr "Chiudi la finestra delle preferenze e scarta le modifiche"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
 msgid "Save the preferences and close the dialog"
-msgstr ""
+msgstr "Salva le preferenze e chiudi la finestra"
 
 #. some common tabs
@@ -12046,5 +12136,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:118
 msgid "Download plugins"
-msgstr ""
+msgstr "Scarica estensioni"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:150
@@ -12085,17 +12175,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:70
 msgid "File backup"
-msgstr ""
+msgstr "Copia di riserva del file"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
 msgid "Configure your identity and how to authenticate at the OSM server"
 msgstr ""
+"Configura l'identità personale e la modalità di autenticazione al server OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
 msgid "Configure whether to use a proxy server"
-msgstr ""
+msgstr "Configura se utilizzare un server proxy"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73
 msgid "Configure whether to create backup files"
-msgstr ""
+msgstr "Configura se creare delle copie di riserva dei file"
 
 #. 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
@@ -12255,14 +12346,16 @@
 "list of available plugins."
 msgstr ""
+"Si prega di cliccare su <strong>Scarica lista</strong> per scaricare e "
+"visualizzare una lista delle estensioni disponibili."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:112
 #, java-format
 msgid "{0}: Version {1} (local: {2})"
-msgstr ""
+msgstr "{0}: Versione {1} (locale: {2})"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
 #, java-format
 msgid "Testing OSM API URL ''{0}''"
-msgstr ""
+msgstr "Verifica dell''indirizzo URL delle API di OSM ''''{0}''''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
@@ -12276,5 +12369,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:82
 msgid "Invalid API URL"
-msgstr ""
+msgstr "Indirizzo URL delle API non valido"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
@@ -12284,4 +12377,7 @@
 "<br>Please check the spelling of ''{1}'' and validate again.</html>"
 msgstr ""
+"<html>Fallita la costruzione dell''indirizzo URL ''''{0}'''' per la "
+"validazione del server delle API di OSM.<br>Si prega di controllare "
+"l''ortografia di ''''{1}'''' e di validare nuovamente.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
@@ -12291,4 +12387,7 @@
 "''{1}'' and your Internet connection and validate again.</html>"
 msgstr ""
+"<html>Fallita la connessione all''indirizzo URL ''''{0}''''.<br>Si prega di "
+"controllare l''ortografia di ''''{1}'''', la propria connessione ad internet "
+"e di validare nuovamente.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:98
@@ -12296,5 +12395,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:131
 msgid "Connection to API failed"
-msgstr ""
+msgstr "Connessione alle API fallita"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
@@ -12305,4 +12404,8 @@
 "<br>Please check the spelling of ''{1}'' and validate again.</html>"
 msgstr ""
+"<html>Fallito l''ottenimento di una lista dei gruppi di modifiche dal server "
+"delle API di OSM su<br>''''{1}''''. Il server ha risposto con il codice di "
+"ritorno {0} invece di 200.<br>Si prega di controllare l''ortografia di "
+"''''{1}'''' e di validare nuovamente.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
@@ -12316,5 +12419,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59
 msgid "Use Basic Authentication"
-msgstr ""
+msgstr "Utilizza autenticazione di base"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
@@ -12322,12 +12425,14 @@
 "Select to use HTTP basic authentication with your OSM username and password"
 msgstr ""
+"Selezionare per utilizzare l'autenticazione di base HTTP con il proprio nome "
+"utente e password OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
 msgid "Use OAuth"
-msgstr ""
+msgstr "Utilizza OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
 msgid "Select to use OAuth as authentication mechanism"
-msgstr ""
+msgstr "Selezionare per utilizzare OAuth come meccanismo di autenticazione"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
@@ -12337,4 +12442,7 @@
 "authentication method ''Basic Authentication''."
 msgstr ""
+"Attenzione: Valore non supportato nella preferenza ''''{0}'''', ottenuto "
+"''''{1}''''. Impostata l''autenticazione di base come metodo di "
+"autenticazione"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
@@ -12361,8 +12469,15 @@
 "server. <strong>Do not use a valuable password.</strong></p></body></html>"
 msgstr ""
+"<html><body><p class=\"warning-body\"><strong>Attenzione:</strong> La "
+"password è memorizzata in chiaro nel file delle preferenze di JOSM. Inoltre "
+"è trasferita <strong>non criptata</strong> in ogni richiesta inviata al "
+"server OSM. <strong>Non utilizzare una password importante.</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 ""
+"Attenzione: fallito l'ottenimento delle credenziali OSM dal gestore delle "
+"credenziali."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:118
@@ -12372,17 +12487,23 @@
 #, java-format
 msgid "Current credential manager is of type ''{0}''"
-msgstr ""
+msgstr "Il gestore delle credenziali corrente è di tipo ''''{0}''''"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:139
 msgid "Warning: failed to save OSM credentials to credential manager."
 msgstr ""
+"Attenzione: fallito il salvataggio delle credenziali OSM sul gestore delle "
+"credenziali."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
 msgid "Warning: Failed to retrieve OAuth Access Token from credential manager"
 msgstr ""
+"Attenzione: Fallito l'ottenimento del token di accesso OAuth dal gestore "
+"delle credenziali"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
 msgid "Warning: Failed to store OAuth Access Token to credentials manager"
 msgstr ""
+"Attenzione: Fallita la memorizzazione del token di accesso OAuth sul gestore "
+"delle credenziali"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
@@ -12394,9 +12515,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
 msgid "You already have an Access Token to access the OSM server using OAuth."
-msgstr ""
+msgstr "Si possiede già un token di accesso al server OSM mediante OAuth."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
 msgid "Save to preferences"
-msgstr ""
+msgstr "Salva sulle preferenze"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
@@ -12406,5 +12527,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
 msgid "New Access Token"
-msgstr ""
+msgstr "Nuovo token di accesso"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:331
@@ -12417,4 +12538,6 @@
 msgid "Click test access to the OSM server with the current access token"
 msgstr ""
+"Cliccare per verificare l'accesso al server OSM con il token di accesso "
+"corrente"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:62
@@ -12422,8 +12545,10 @@
 msgid "<html>Use the default OSM server URL (<strong>{0}</strong>)</html>"
 msgstr ""
+"<html>Utilizza l''indirizzo URL predefinito del server OSM (<strong>{0}</"
+"strong>)</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:88
 msgid "OSM Server URL:"
-msgstr ""
+msgstr "Indirizzo URL del server OSM:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
@@ -12433,17 +12558,19 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:153
 msgid "Test the API URL"
-msgstr ""
+msgstr "Verifica l'indirizzo URL delle API"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:169
 msgid "The API URL is valid."
-msgstr ""
+msgstr "L'indirizzo URL delle API è valido."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:174
 msgid "Validation failed. The API URL seems to be invalid."
 msgstr ""
+"Validazione fallita. L'indirizzo URL delle API non sembra essere valido."
 
 #: ../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 ""
+"L'indirizzo URL della API di OSM non può essere vuoto. Si prega di inserirlo."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:239
@@ -12453,5 +12580,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:241
 msgid "Please enter the OSM API URL."
-msgstr ""
+msgstr "Si prega di inserire l'indirizzo URL delle API di OSM."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:104
@@ -12506,4 +12633,7 @@
 "JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
 msgstr ""
+"Attenzione: JOSM è configurato per utilizzare i proxy dalle impostazioni di "
+"sistema, ma la JVM non è configurata in modo da ottenerli. Reimposto le "
+"preferenze su ''No proxy''"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
@@ -12528,5 +12658,12 @@
 msgstr "Elimina la selezione nella tabella delle etichette"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -12534,18 +12671,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "Attributi opzionali:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr "percorso chiuso"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo sconosciuto: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -12556,16 +12693,16 @@
 msgstr "Impossibile leggere la lista delle etichette preimpostate: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Impossibile leggere {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, 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:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -12574,18 +12711,17 @@
 msgstr[1] "Modifica {0} oggetti"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "Non è stato selezionato niente!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "Selezione non adatta!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "Applica preimpostazione"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Modifica Proprietà"
@@ -12644,11 +12780,9 @@
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
 "capabilities. Got ''{2}''"
 msgstr ""
-"Attenzione: valore non valido per l''attributo ''''{0}'''' dell''elemento "
-"''''{1}'''' per le capacità del server. Ottenuto ''{2}"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
@@ -12884,6 +13018,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12897,4 +13031,6 @@
 "available"
 msgstr ""
+"E'' stato generato un errore durante l''analisi del file gpx {0}. Sarà "
+"disponibile solamente parte del file"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
@@ -12908,10 +13044,10 @@
 msgstr "Analisi del file \"{0}\" fallita"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
 "Errore di scansione: struttura del documento non valida per un documento gpx"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12927,23 +13063,28 @@
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
-#, fuzzy
 msgid "Looking for image files"
-msgstr "Ricerca della riva..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
 msgid "No image files found."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+msgstr "Non è stato trovato alcun file immagine."
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
-msgstr ""
+msgstr "Fallita l''apertura del flusso di ingresso per la risorsa ''''{0}''''"
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, fuzzy, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+"Attenzione: fallita la lettura del messaggio del giorno da ''''{0}''''. "
+"L''eccezione è stata: {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#, fuzzy, java-format
+#, java-format
 msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
-"Nessuna primitiva con {0} nell''insieme di dati locale. Non è possibile "
-"dedurre il tipo di primitiva."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308
@@ -13012,5 +13153,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "Coordinate importate: "
@@ -13118,9 +13259,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Caricamento di {0} oggetti..."
-msgstr[1] "Caricamento di {0} oggetti..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -13281,4 +13422,6 @@
 "''create'', ''modify'', or ''delete''."
 msgstr ""
+"Struttura del documento non valida. E' stato trovato un nodo, percorso o "
+"relazione al di fuori di un ''create'', ''modify'' o ''delete''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:259
@@ -13344,4 +13487,6 @@
 msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
 msgstr ""
+"Fallita la firma di una connessione HTTP con una testata di autenticazione "
+"OAuth"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:136
@@ -13349,4 +13494,6 @@
 msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
 msgstr ""
+"Attenzione: valore non atteso per la preferenza ''''{0}''''. Ottenuto "
+"''''{1}''''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
@@ -13678,5 +13825,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:126
 msgid "Reading user info ..."
-msgstr ""
+msgstr "Lettura delle informazioni utente ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:79
@@ -13715,9 +13862,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159
-#, fuzzy, java-format
+#, java-format
 msgid "({0}/{1}) Uploading {2} object..."
 msgid_plural "({0}/{1}) Uploading {2} objects..."
-msgstr[0] "({0}/{1}) Caricamento di {2} oggetti..."
-msgstr[1] "({0}/{1}) Caricamento di {2} oggetti..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
@@ -13763,5 +13910,5 @@
 #, java-format
 msgid "Failed to create plugin directory ''{0}''"
-msgstr ""
+msgstr "Fallita la creazione della cartella ''''{0}'''' per l''estensione"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:162
@@ -13780,9 +13927,10 @@
 msgid_plural ""
 "The following plugins are no longer necessary and have been deactivated:"
-msgstr[0] ""
+msgstr[0] "L'estensione seguente non è più necessaria ed è stata disattivata:"
 msgstr[1] ""
+"Le estensioni seguenti non sono più necessarie e sono state disattivate:"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Loading of the plugin \"{0}\" was requested.<br>This plugin is no "
@@ -13790,7 +13938,4 @@
 "disabled.<br>Delete from preferences?</html>"
 msgstr ""
-"<html>E'' stato richiesto il caricamento dell''estensione {0}.<br>Questa "
-"estensione non è più mantenuta e molto probabilmente produrrà degli errori."
-"<br>Dovrebbe essere disabilitata.<br>Rimuovere dalle preferenze?</html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:167
@@ -13808,7 +13953,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:194
-#, fuzzy
 msgid "Click to update the activated plugins"
-msgstr "Cliccare per chiudere la finestra"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
@@ -13821,5 +13965,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -13828,7 +13972,5 @@
 "are:"
 msgstr[0] ""
-"L''estensione {0} è richiesta dall''estensione {1}, ma non è stata trovata."
 msgstr[1] ""
-"L''estensione {0} è richiesta dall''estensione {1}, ma non è stata trovata."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13842,5 +13984,5 @@
 #, java-format
 msgid "loading plugin ''{0}''"
-msgstr ""
+msgstr "caricamento estensione ''''{0}''''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:354
@@ -13851,14 +13993,14 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:373
 msgid "Loading plugins ..."
-msgstr ""
+msgstr "Caricamento estensioni ..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:374
 msgid "Checking plugin preconditions..."
-msgstr ""
+msgstr "Controllo requisiti estensione..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:401
 #, java-format
 msgid "Loading plugin ''{0}''..."
-msgstr ""
+msgstr "Caricamento estensione ''''{0}''''..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:482
@@ -13866,29 +14008,31 @@
 msgid_plural "JOSM could not find information about the following plugins:"
 msgstr[0] ""
+"JOSM non riesce a trovare le informazioni riguardanti la seguente estensione:"
 msgstr[1] ""
+"JOSM non riesce a trovare le informazioni riguardanti le seguenti estensioni:"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:490
 msgid "The plugin is not going to be loaded."
 msgid_plural "The plugins are not going to be loaded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "L'estensione non sarà caricata."
+msgstr[1] "Le estensioni non saranno caricate."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:516
 msgid "Determine plugins to load..."
-msgstr ""
+msgstr "Determinazione delle estensioni da caricare..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:522
 msgid "Removing deprecated plugins..."
-msgstr ""
+msgstr "Rimozione delle estensioni deprecate..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:524
 msgid "Removing umaintained plugins..."
-msgstr ""
+msgstr "Rimozione delle estensioni non più mantenute..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:548
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "E' fallito l'aggiornamento della seguente estensione:"
+msgstr[1] "E' fallito l'aggiornamento delle seguenti estensioni:"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:559
@@ -13904,5 +14048,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:567
 msgid "Plugin update failed"
-msgstr ""
+msgstr "Aggiornamento dell'estensione fallito"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:623
@@ -13913,7 +14057,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:625
-#, fuzzy, java-format
+#, java-format
 msgid "Click to delete the plugin ''{0}''"
-msgstr "Elimina la vecchia estensione {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
@@ -13932,4 +14076,5 @@
 msgid "Warning: failed to delete outdated plugin ''{0}''."
 msgstr ""
+"Attenzione: fallita l''eliminazione dell''estensione obsoleta ''''{0}''''."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:701
@@ -13940,4 +14085,7 @@
 "installation. JOSM still going to load the old plugin version."
 msgstr ""
+"Attenzione: fallita l''installazione dell''estensione ''''{0}'''' già "
+"scaricata. Installazione annullata. JOSM continuerà a caricare la vecchia "
+"versione dell''estensione."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:706
@@ -13947,9 +14095,11 @@
 "''{1}''. Renaming failed."
 msgstr ""
+"Attenzione: fallita l''installazione dell''estensione ''''{0}'''' dal file "
+"temporaneo ''''{1}''''. E'' fallito il cambio del nome."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#, fuzzy, java-format
+#, java-format
 msgid "Click to disable the plugin ''{0}''"
-msgstr "Cliccare per chiudere la finestra"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:731
@@ -13995,16 +14145,15 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:890
-#, fuzzy
 msgid "Do not check and ask again at startup (remembers choice)"
-msgstr "Non visualizzare nuovamente (ricorda la scelta)"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:69
-#, fuzzy, java-format
+#, java-format
 msgid "The plugin file ''{0}'' does not include a Manifest."
-msgstr "il file \"{0}\" non esiste"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:181
 msgid "More info..."
-msgstr ""
+msgstr "Ulteriori informazioni..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginListParser.java:42
@@ -14013,13 +14162,15 @@
 msgid "Failed to create plugin information from manifest for plugin ''{0}''"
 msgstr ""
+"Fallita la creazione delle informazioni sull''estensione ''''{0}'''' in base "
+"al 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 ""
+msgstr "Lettura delle informazioni locali sull'estensione.."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:80
 msgid "Processing plugin site cache files..."
-msgstr ""
+msgstr "Elaborazione dei file di cache del sito dell'estensione..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:84
@@ -14027,5 +14178,5 @@
 #, java-format
 msgid "Processing file ''{0}''"
-msgstr ""
+msgstr "Elaborazione del file ''''{0}''''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:88
@@ -14034,17 +14185,19 @@
 msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
+"Attenzione: Fallita la ricerca delle informazioni sull''estensione nel file "
+"''''{0}''''. Saltato."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:105
 msgid "Processing plugin files..."
-msgstr ""
+msgstr "Elaborazione dei file dell'estensione..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:48
 msgid "Download plugin list..."
-msgstr ""
+msgstr "Scarica la lista delle estensioni..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:112
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
-msgstr ""
+msgstr "Scaricamento della lista delle estensioni da ''''{0}''''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:163
@@ -14054,14 +14207,17 @@
 "from plugin site ''{1}''."
 msgstr ""
+"Attenzione: fallita la creazione della cartella delle estensioni "
+"''''{0}''''. Non è possibile memorizzare la lista delle estensioni dal sito "
+"''''{1}''''."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:167
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
-msgstr ""
+msgstr "Scrittura della lista delle estensioni su file locale ''''{0}''''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:191
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
-msgstr ""
+msgstr "Analisi della lista delle estensioni dal sito ''''{0}''''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:196
@@ -14072,9 +14228,11 @@
 "Exception was: {1}"
 msgstr ""
+"Fallita l''analisi della lista delle estensioni dal sito ''''{0}''''. Sito "
+"ignorato. L''eccezione è stata: {1}"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:209
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
-msgstr ""
+msgstr "Elaborazione della lista delle estensioni dal sito ''''{0}''''"
 
 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:301
@@ -14097,5 +14255,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14103,9 +14260,4 @@
 "file a bug report."
 msgstr ""
-"Si è verificata un''eccezione inattesa.\n"
-"\n"
-"Questo è sempre un errore di programmazione. Se si sta usando la versione\n"
-"di JOSM più recente, si consideri gentilmente la possibilità di\n"
-"inoltrare un bug report."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -14118,4 +14270,6 @@
 "you have updated to the latest version of JOSM here:"
 msgstr ""
+"Ci si è imbattuti in un errore di JOSM. Prima di segnalare questo problema "
+"assicurarsi di aver aggiornato JOSM all'ultima versione da qui:"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:121
@@ -14124,4 +14278,7 @@
 "bug report in our bugtracker using this link:"
 msgstr ""
+"Si dovrebbero aggiornare anche le proprie estensioni. Se nemmeno questo "
+"risolve la situazione si prega di inserire una segnalazione del problema nel "
+"nostro bugtracker utilizzando questo collegamento:"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:125
@@ -14131,4 +14288,7 @@
 "supply as much detail as possible."
 msgstr ""
+"Le informazioni sull'errore sono state di seguito già inserite. Si prega di "
+"includere la procedura per riprodurlo e il maggior numero possibile di "
+"dettagli in merito."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129
@@ -14144,5 +14304,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:151
 msgid "You have encountered a bug in JOSM"
-msgstr ""
+msgstr "Ci si è imbattuti in un bug di JOSM"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:41
@@ -14153,5 +14313,5 @@
 msgstr ""
 "<html>Fallita l''inizializzazione della comunicazione con il server OSM {0}."
-"<br>Controllare l''indirizzo URL del server nelle proprie preferenze e la "
+"<br>Controllare l''indirizzo URL del server nelle preferenze personali e la "
 "propria connessione ad internet.</html>"
 
@@ -14193,4 +14353,7 @@
 "html>"
 msgstr ""
+"<html>E'' fallita l''autenticazione al server OSM con il nome utente "
+"''''{0}''''.<br>Si prega di controllare il nome utente e la password nelle "
+"preferenze di JOSM.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:122
@@ -14201,13 +14364,20 @@
 "html>"
 msgstr ""
+"<html>E'' fallita l''autenticazione con il server OSM con il token OAuth "
+"''''{0}''''.<br>Si prega di aprire la finestra delle preferenze e di "
+"ottenere un altro token OAuth.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:132
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>E'' faliita l''autorizzazione al server OSM con il token OAuth "
+"''''{0}''''.<br>Il token non è autorizzato ad accedere alla risorsa "
+"protetta<br>''''{1}''''.<br>Si prega di aprire la finestra delle preferenze "
+"ed ottenere un altro token OAuth.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
@@ -14360,6 +14530,6 @@
 "{1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -14370,5 +14540,5 @@
 "ragioni di sicurezza. L''eccezione è stata: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -14393,4 +14563,6 @@
 "platform first."
 msgstr ""
+"Fallita l'apertura dell'indirizzo URL. Non è stata selezionata ancora alcuna "
+"piattaforma. Si prega prima di selezionarne una."
 
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:448
@@ -14543,4 +14715,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr "Visibilità"
@@ -14632,5 +14805,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "Interpolazione indirizzo"
@@ -14865,4 +15038,6 @@
 "Server in maintenance or temporary overloaded."
 msgstr ""
+"Impossibile aprire una nuova sessione del client.\n"
+"Il server è in manutenzione oppure temporaneamente sovraccaricato."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:88
@@ -15264,5 +15439,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr "Posizione"
@@ -15382,5 +15557,5 @@
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:68
 msgid "Use"
-msgstr "Uso"
+msgstr "Usa"
 
 #: ../plugins/colorscheme/src/at/dallermassl/josm/plugin/colorscheme/ColorSchemePreference.java:72
@@ -15432,21 +15607,21 @@
 "Eliminare l''area dalla relazione prima di dividerla."
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr "File TangoGPS (*.log)"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr "Errori di formato: "
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr "Importazione TangoGPS corretta"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr "Importazione TangoGPS fallita!"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr "File TCX (*.tcx)"
@@ -15478,9 +15653,9 @@
 msgstr "Crea un percorso duplicato"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr "Livello per la modifica dei tracciati GPX"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Converti in livello GPX con orario anonimo"
@@ -15495,13 +15670,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr "Importa percorso da un livello GPX"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr "Elimina percorso esistente"
@@ -15510,6 +15685,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr "Non è stato trovato alcun livello dei dati GPX."
@@ -15738,17 +15913,17 @@
 msgstr "Carica le immagini come un nuovo layer."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr "Indice di direzione ''{0}'' non trovato"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr "La posizione iniziale non è all''interno del riquadro di selezione"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:105
 msgid "Looking for shoreline..."
 msgstr "Ricerca della riva..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -15792,42 +15967,41 @@
 msgstr "Rimozione dei nodi duplicati in corso..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr "Traccia Lakewalker"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr "E'' stato generato un errore sconosciuto"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "est"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "nordest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "nord"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "nordovest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "ovest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "sudovest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "sud"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "sudest"
@@ -15883,6 +16057,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -15891,69 +16065,69 @@
 msgstr "acqua"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "linea di costa"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "terraferma"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Maximum number of segments per way"
 msgstr "Numero massimo di segmenti per percorso"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
 msgid "Maximum number of nodes in initial trace"
 msgstr "Numero massimo di nodi nel tracciato iniziale"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Valore massimo del colore grigio da considerare come acqua (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
 msgid "Line simplification accuracy (degrees)"
 msgstr "Accuratezza della semplificazione della linea (gradi)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Risoluzione dei tasselli Landsat (pixel per gradi)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Dimensione dei tasselli Landsat (pixel)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
 msgid "Shift all traces to east (degrees)"
 msgstr "Sposta tutti i tracciati verso est (gradi)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
 msgid "Shift all traces to north (degrees)"
 msgstr "Sposta tutti i tracciati verso nord (gradi)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
 msgid "Direction to search for land"
 msgstr "Direzione di ricerca della terraferma"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
 msgid "Tag ways as"
 msgstr "Etichetta i percorsi come"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr "Livello WMS"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr "Dimensione massima della cache (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
 msgid "Maximum cache age (days)"
 msgstr "Età massima della cache (giorni)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:68
 msgid "Source text"
 msgstr "Testo sorgente"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
@@ -15961,5 +16135,5 @@
 "250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -15969,5 +16143,5 @@
 "Predefinito 50000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -15977,5 +16151,5 @@
 "dati Landsat IR-1). Può essere nell''intervallo 0-255. Predefinito 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -15986,5 +16160,5 @@
 "Predefinito 0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -15993,22 +16167,22 @@
 "4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 "Dimensione di un tassello Landsat, misurata in pixel. Predefinito 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Sposta tutti i punti verso la direzione Est (gradi). Predefinito 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Sposta tutti i punti verso la direzione Nord (gradi). Predefinito 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Direction to search for land. Default east."
 msgstr "Direzione di ricerca della terraferma. Predefinita è Est."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
@@ -16016,34 +16190,34 @@
 "queste. Predefinito è acqua."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "Quale livello WMS usare per il tracciamento. IR1 è il predefinito."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 "Dimensione massima in byte per ogni cartella di cache. Predefinita è 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr "Età massima in giorni per ogni file nella cache. Predefinita è 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr "Sorgente dei dati. Predefinita è Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "Una estensione per tracciare le superfici acquee su immagini Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr "Preferenze dell''estensione Lakewalker"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:50
 msgid "Downloading image tile..."
 msgstr "Scaricamento immagine tassello in corso..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr "Impossibile acquisire l''immagine"
@@ -16067,5 +16241,5 @@
 msgstr "Connessione fallita"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr "senza nome"
@@ -16096,5 +16270,5 @@
 msgstr "Rotta"
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr "Livello LiveGPS"
@@ -16172,5 +16346,5 @@
 msgstr "Angolo compreso tra due nodi selezionati"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr "Livello in cui fare le misurazioni"
@@ -16298,5 +16472,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:94
 msgid "Process queue"
-msgstr ""
+msgstr "Elabora coda"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:103
@@ -16311,5 +16485,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:110
 msgid "Bug list"
-msgstr ""
+msgstr "Lista dei bug"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:133
@@ -16369,5 +16543,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:94
 msgid "Close: "
-msgstr ""
+msgstr "Chiudi: "
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:59
@@ -16386,5 +16560,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/NewIssueAction.java:101
 msgid "Create: "
-msgstr ""
+msgstr "Crea: "
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/OsbAction.java:96
@@ -16407,4 +16581,6 @@
 msgid "You have unsaved changes in your queue. Do you want to submit them now?"
 msgstr ""
+"Sono presenti dei cambiamenti non salvati nella propria coda. Si desidera "
+"inviarli ora?"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
@@ -16446,4 +16622,76 @@
 msgid "Firefox executable"
 msgstr "Eseguibile di Firefox"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#, fuzzy
+msgid "Read error!"
+msgstr "Serbatoio"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Inserire le coordinate per il nuovo nodo."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Mantieni i file di backup"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Errore"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "Il file dell''immagine non può essere eliminato."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Impossibile rinominare il file ''{0}''"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Mantieni i file di backup"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "Mantieni i file di backup"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Sovrascrivi"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+#, fuzzy
+msgid "Could not delete temporary file!"
+msgstr "Impossibile importare i file."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
@@ -16701,5 +16949,5 @@
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:62
 msgid "Autoload Tiles: "
-msgstr "Carica utomaticamente i tasselli: "
+msgstr "Carica automaticamente i tasselli "
 
 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:66
@@ -16724,6 +16972,6 @@
 msgstr "Salva ogni minuto su file i dati acquisiti."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -16851,74 +17099,133 @@
 "preimpostazioni delle etichette."
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+#, fuzzy
+msgid "Terrace a house"
+msgstr "Crea complesso da singolo edificio"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+msgid "Interpolation"
+msgstr "Interpolazione"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr "Segmenti"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Strade"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Numero più alto"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Numero più basso"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+#, fuzzy
+msgid "Lowest housenumber of the terraced house"
+msgstr ""
+"Il numero civico più basso non può essere maggiore del numero civico più alto"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Crea una nuova relazione"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Elimina percorsi duplicati"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Nome Strada"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr "Pari/dispari"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr "Numero più basso"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr "Numero più alto"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr "Segmenti"
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 "Il numero civico più basso non può essere maggiore del numero civico più alto"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr "I numeri civici non corrispondono all''impostazione pari/dispari"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr "Il numero dei segmenti deve essere maggiore di 1"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr "{0} deve essere maggiore di 0"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr "{0} non è un numero"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr "Inverti un complesso"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr "Inverte i numeri civici di un complesso di edifici."
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr "Inverti un complesso"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:83
+#, fuzzy
+msgid "Cannot reverse!"
+msgstr "non presente"
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:125
 msgid "Reverse Terrace"
 msgstr "Inverti complesso"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr "Crea complesso da singolo edificio"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr "Crea edifici singoli da un edificio lungo"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr ""
 "Selezionare un percorso chiuso singolo composto da almeno quattro nodi."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr "Complesso"
@@ -17159,5 +17466,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr "Nodi duplicati"
@@ -17168,5 +17475,5 @@
 "Questo controllo verifica che non ci siano due nodi nella stessa posizione."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -17178,9 +17485,9 @@
 "(che non puoi vedere).<br>Vuoi veramente cancellarli?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr "Conferma"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr "Nodi nella stessa posizione"
@@ -17217,5 +17524,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr "Multi-poligono"
@@ -17223,29 +17530,29 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:26
 msgid "This test checks if multipolygons are valid"
-msgstr ""
+msgstr "Questo controllo verifica che i multi-poligoni siano validi"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:38
 msgid "Multipolygon is not closed"
-msgstr ""
+msgstr "Il multi-poligono non è chiuso"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:42
 msgid "No outer way for multipolygon"
-msgstr ""
+msgstr "Nessun percorso esterno per il multi-poligono"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:54
 msgid "Multipolygon inner way is outside."
-msgstr ""
+msgstr "Il percorso interno del multi-poligono è esterno."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:56
 msgid "Intersection between multipolygon ways"
-msgstr ""
+msgstr "Intersezione tra i percorsi del multi-poligono"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:66
 msgid "No useful role for multipolygon member"
-msgstr ""
+msgstr "Nessun ruolo utile per il membro del multi-poligono"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:69
 msgid "Non-Way in multipolygon."
-msgstr ""
+msgstr "Non-percorso nel multi-poligono."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:35
@@ -17375,7 +17682,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr "Combinazione illegale etichetta/valore"
@@ -17383,43 +17690,43 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr "Problema di disegno"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Chiave ''{0}'' non valida."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr "Tag con valori vuoti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr "chiave della proprietà non valida"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr "spazio non valido nella chiave della proprietà"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr "Il valore della proprietà inizia o finisce con uno spazio"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr "Il valore della proprietà contiene una entità HTML"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Chiave ''''{0}'''' non presente nei preimpostati."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr "I preimpostati non contengono la chiave della proprietà"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
@@ -17427,17 +17734,17 @@
 "Valore ''''{0}'''' per la chiave ''''{1}'''' non presente nei preimpostati."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr "I preimpostati non contengono il valore della proprietà"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr "FIXME"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr "Verifica le chiavi delle proprietà."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
@@ -17445,22 +17752,22 @@
 "valide."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr "Usa un analizzatore delle proprietà complesso."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 "Valida i valori delle proprietà e delle etichette usando regole complesse."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr "Sorgente TagChecker"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -17471,25 +17778,25 @@
 "delle etichette."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr "Aggiungi una nuova sorgente alla lista."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr "Modifica la sorgente selezionata."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "Elimina la sorgente selezionata nella lista."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "Sorgenti dei dati"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr "Verifica i valori delle proprietà."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
@@ -17497,9 +17804,9 @@
 "validi."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr "Cerca FIXME."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
@@ -17507,25 +17814,25 @@
 "proprietà."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr "Controllare le note di disegno."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr "Controllare se il disegno della mappa contiene degli errori."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr "Usa file dati predefinito."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr "Usa il file dati predefinito (consigliato)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr "Utilizza il file di \"ignoramento\" dell''etichetta predefinita"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
@@ -17533,30 +17840,30 @@
 "(consigliato)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr "Usa file di controllo ortografico predefinito."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Usa il file di controllo ortografico predefinito (consigliato)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr "Correggi proprietà"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr "Impossibile trovare il tipo di elemento"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr "Impossibile trovare il livello di avvertimento"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Espressione illegale \"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -18032,5 +18339,5 @@
 msgstr "Livello WMS ({0}), scaricamento per il livello di ingrandimento {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -18046,13 +18353,17 @@
 "WMS?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr "Si, preleva le immagini"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr "Indirizzo URL non valido?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+msgid "Download visible tiles"
+msgstr "Scarica i tasselli visibili"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -18061,50 +18372,46 @@
 "visuale, oppure di cambiare la risoluzione"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
-msgid "Download visible tiles"
-msgstr "Scarica i tasselli visibili"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "Cambia risoluzione"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr "Ricarica i tasselli non corretti"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "Salva il livello WMS su file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr "Salva livello WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "Carica il livello WMS da file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr "Carica livello WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, 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:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr "Errore nel formato del file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "Errore durante il caricamento del file"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr "Imposta segnalibro WMS"
@@ -18403,6 +18710,13 @@
 "correntemente visibile."
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -18413,15 +18727,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Il grande aspetto e stile JGoodies Plastic."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr "Permetti alle altre applicazioni di inviare comandi a JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -18433,10 +18747,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr "Fornisce funzioni di navigazione"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -18447,15 +18761,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Permetti l''aggiunta di marcatori/nodi alle posizioni gps correnti."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Fornisce un''interfaccia per l''editing dei tag in forma tabulare"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -18469,10 +18783,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr "Costruisce degli edifici a schiera a partire da singoli blocchi."
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -18484,5 +18798,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -18494,5 +18808,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -18500,5 +18814,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -18607,6 +18921,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -18614,6 +18937,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "Riferimento"
@@ -18630,5 +18954,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Corsie"
@@ -18650,10 +18974,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Velocità massima (km/h)"
@@ -18697,14 +19021,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "Senso unico"
@@ -18747,13 +19071,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -18791,13 +19115,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Galleria/tunnel"
@@ -18832,13 +19156,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "Sbancamento"
@@ -18873,13 +19197,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "Terrapieno"
@@ -19011,4 +19335,13 @@
 msgid "Edit Unclassified Road"
 msgstr "Modifica una strada unclassified"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr ""
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -19026,15 +19359,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr "Larghezza (metri)"
@@ -19046,5 +19379,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Strada residenziale"
@@ -19053,5 +19386,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "Modifica strada residenziale"
@@ -19069,16 +19402,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Superficie"
@@ -19100,166 +19436,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr "pavimentata"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr "non pavimentata"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr "asfalto"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr "calcestruzzo"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr "metallo"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "bosco"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr "lastricato"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr "ciottoli (pavé)"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "ghiaia"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr "ciottoli"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr "compattato"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr "erba"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "erba"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "sabbia"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr "terra"
@@ -19267,5 +19610,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr "Living Street"
@@ -19274,5 +19617,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr "Modifica Living Street"
@@ -19280,5 +19623,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "Area pedonale"
@@ -19287,5 +19630,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "Modifica area pedonale"
@@ -19293,5 +19636,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr "Strada di servizio"
@@ -19300,5 +19643,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr "Modifica strada di servizio"
@@ -19308,18 +19651,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr "Tipo di strada di servizio"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr "vicolo"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr "driveway"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr "corsia interna a parcheggio"
@@ -19327,5 +19670,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr "Corsia interna a parcheggio"
@@ -19335,5 +19678,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr "Modifica corsia interna a parcheggio"
@@ -19341,5 +19684,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "Road (Tipo Sconosciuto)"
@@ -19348,5 +19691,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "Modifica Road (Tipo Sconosciuto)"
@@ -19355,20 +19698,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "Restrizioni e divieti"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "Modifica restrizioni e divieti"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "Pedaggio"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "Senza uscita (cul-de-sac)"
@@ -19376,9 +19719,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 msgid "Access"
 msgstr "Permesso di accesso"
 
 #. 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"
@@ -19389,6 +19733,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -19400,4 +19742,5 @@
 #. 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"
@@ -19416,141 +19759,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+msgid "yes"
+msgstr "si"
+
+#. 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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "privato"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+msgstr "specifico"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:219
+msgid "destination"
+msgstr "destinazione"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr "permesso"
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr "Agricolo"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-msgid "yes"
-msgstr "si"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "privato"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-msgstr "specifico"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "destinazione"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr "permesso"
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr "Agricolo"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "no"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr "Carico e scarico merci"
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Merci pesanti/Trasporti eccezionali"
@@ -19565,10 +19916,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr "Cavallo"
@@ -19584,10 +19935,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "Motocicletta"
@@ -19602,27 +19953,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr "Automobile"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr "Veicoli di servizio pubblico"
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr "Barca a motore"
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "Barca"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Velocità minima (km/h)"
@@ -19630,25 +19973,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "Peso massimo (tonnellate)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr "Altezza massima (metri)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr "Larghezza massima (metri)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr "Lunghezza massima (metri)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "Rotatoria"
@@ -19659,5 +20002,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "Modifica un incrocio"
@@ -19677,10 +20020,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "autostrada/tangenziale"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr "collegamento autostradale"
@@ -19702,10 +20045,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "trunk"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr "trunk_link"
@@ -19727,10 +20070,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "primaria"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr "svincolo primario"
@@ -19752,5 +20095,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -19765,9 +20108,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "terziaria"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr "unclassified"
@@ -19781,9 +20124,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "residenziale"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr "living_street"
@@ -19813,10 +20156,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "strada di servizio"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr "autobus guidato"
@@ -19846,5 +20189,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -19856,10 +20199,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Modifica ponte"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr "Modifica un Tunnel"
@@ -19867,19 +20210,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Percorsi"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "Construction"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "Modifica una strada in costruzione"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "Svincolo"
@@ -19895,5 +20238,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "rotatoria"
@@ -19901,5 +20244,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr "Track"
@@ -19908,40 +20251,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr "Modifica Track"
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "Track"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "ghiaia"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "ghiaia"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "ghiaia"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "ghiaia"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "ghiaia"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr ""
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -19949,5 +20286,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -19955,37 +20292,32 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr "escursionismo"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "Mountain bike"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
-msgstr "Percorso escursionistico montano difficile"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
-msgstr "Percorso escursionistico alpino"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
-msgstr "Percorso escursionistico alpino difficile"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
-msgstr "Percorso escursionistico alpino molto difficile"
+msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "Percorso"
@@ -19994,12 +20326,32 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "Modifica percorso"
 
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr "intermedio"
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
+
 #: build/trans_presets.java:489
-#, fuzzy
 msgid "Wheelchairs"
-msgstr "Sedia a rotelle"
+msgstr ""
 
 #: build/trans_presets.java:490
@@ -20015,7 +20367,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "Modifica un percorso per equitazione"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -20028,7 +20379,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "Modifica Cycleway"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -20063,24 +20413,21 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "Unisci comunque"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "Modifica 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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Modifica Footway"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr "Biciclette"
@@ -20088,5 +20435,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "Rampa di scale"
@@ -20096,5 +20443,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Modifica una rampa di scale"
@@ -20102,10 +20449,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr "Punti del percorso"
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "Svincolo autostradale"
@@ -20113,15 +20460,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "Modifica svincolo autostradale"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "Numero"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "Stazione di servizio"
@@ -20129,5 +20476,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr "Modifica stazione di servizio"
@@ -20135,5 +20482,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -20166,17 +20514,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "Operatore"
@@ -20185,5 +20533,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "Semaforo"
@@ -20193,5 +20541,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr "Tipo di attraversamento pedonale"
@@ -20200,27 +20548,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr "non presidiato"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr "Semaforo"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "isola spartitraffico"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr "non marcato"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr "attraversamento a cavallo"
@@ -20228,6 +20576,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr "attraversamento ciclabile"
@@ -20236,11 +20584,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr "Attraversamento controllato"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr "Nome del tipo di attraversamento (UK)"
@@ -20248,30 +20596,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr "strisce pedonali"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr "attraversamento pedonale regolato da semaforo"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "Stop"
@@ -20279,5 +20627,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr "Attraversamento pedonale"
@@ -20286,14 +20634,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr "Modifica attraversamento pedonale"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr "Nome del tipo (UK)"
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr "mini-rotatoria"
@@ -20304,14 +20698,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr "Direzione"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr "senso orario"
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr "Slargo per inversione di marcia"
@@ -20321,26 +20715,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "City Limit"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "Modifica City Limit"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr "Secondo nome"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 msgid "Speed Camera"
 msgstr "Speed Camera"
 
 #. 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "Telefono di emergenza"
@@ -20348,5 +20744,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr "Rampa"
@@ -20354,5 +20750,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr "Rampa ripida"
@@ -20360,11 +20756,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr "Guado"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr "Modifica guado"
@@ -20372,5 +20775,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr "Passo montano"
@@ -20378,5 +20781,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr "Modifica passo montano"
@@ -20388,7 +20791,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "Elevazione"
@@ -20396,5 +20799,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Barriere"
@@ -20402,5 +20805,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr "Colonnina"
@@ -20408,5 +20811,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr "Modifica colonnina"
@@ -20451,16 +20854,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "Traffico permesso:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr "Barriera per biciclette"
@@ -20469,5 +20872,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr "Blocco"
@@ -20475,5 +20878,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr "Griglia"
@@ -20481,10 +20884,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr "Modifica griglia"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr "Trappola bus"
@@ -20492,15 +20895,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr "Spunzoni"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr "Modifica spunzoni"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "Casello (per pedaggio)"
@@ -20508,5 +20911,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "Modifica casello (per pedaggio)"
@@ -20514,10 +20917,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr "Dogana"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr "Modifica dogana"
@@ -20527,5 +20930,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr "Siepe"
@@ -20534,12 +20937,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:817 build/trans_presets.java:819
 msgid "Fence"
 msgstr "Recinto"
 
-#. item "Barriers/Fence"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "Muro"
@@ -20547,5 +20962,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "Cinta muraria"
@@ -20554,5 +20969,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr "Muro di contenimento"
@@ -20564,15 +20979,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr "Punto di accesso"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr "Modifica punto di accesso"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "Cancello"
@@ -20580,50 +20996,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr "Modifica cancello"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr "Cancello a sollevamento"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr "Modifica cancello a sollevamento"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr "Cancello di filo spinato"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr "Modifica cancello di filo spinato"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr "Bump Gate"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr "Modifica un Bump Gate"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr "Kissing Gate"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr "Modifica un Kissing Gate"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr "Scaletta"
@@ -20631,25 +21047,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr "Modifica scaletta"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr "Tornello"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr "Modifica tornello"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr "Porta di cinta muraria"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr "Modifica porta di cinta muraria"
@@ -20660,11 +21076,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "Acqua"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "Sorgente"
@@ -20672,5 +21088,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "Modifica sorgente"
@@ -20678,5 +21094,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr "Canale di scolo"
@@ -20684,10 +21100,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr "Modifica un canale di scolo"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "Torrente"
@@ -20695,10 +21122,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "Modifica un torrente"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "Canale"
@@ -20706,10 +21133,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "Modifica un canale"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "Fiume"
@@ -20719,5 +21146,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "Modifica un fiume"
@@ -20725,15 +21152,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Modifica acqua"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "Terraferma"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "Modifica terraferma"
@@ -20741,15 +21168,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr "Bacino"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr "Modifica area di bacino"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr "Serbatoio"
@@ -20757,15 +21184,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr "Modifica area di riserva d''acqua"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr "Bacino coperto"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr "Modifica bacino coperto"
@@ -20773,5 +21200,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "Argine"
@@ -20780,10 +21207,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "Modifica un argine"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr "Zona umida"
@@ -20794,14 +21221,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr "Modifica zona umida"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "palude"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr "torbiera"
@@ -20815,35 +21242,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr "palude alluvionale"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr "canneto"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr "palude salata"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr "barena"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr "mangrovie"
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "Zona fangosa (sabbie mobili)"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr "Modifica zona fangosa (sabbie mobili)"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "Spiaggia"
@@ -20851,20 +21278,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "Modifica spiaggia"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "Baia"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "Modifica baia"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "Rupe"
@@ -20872,10 +21299,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "Modifica Rupe"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "Linea di costa"
@@ -20883,5 +21310,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "Modifica linea di costa"
@@ -20889,5 +21316,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "Linea traghetto"
@@ -20895,5 +21322,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr "Modifica una linea traghetto"
@@ -20902,5 +21329,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr "Cantiere navale"
@@ -20908,10 +21335,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr "Modifica cantiere navale"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "Darsena/bacino navale"
@@ -20919,5 +21346,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr "Modifica una darsena/bacino navale"
@@ -20925,5 +21352,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "Diga"
@@ -20931,15 +21358,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "Modifica una diga"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr "Punto di corso d''acqua"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr "Chiusa (non blocca la navigazione)"
@@ -20948,5 +21375,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr "Sbarramento"
@@ -20954,20 +21381,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr "Modifica sbarramento"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "Cascata"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "Modifica una cascata"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr "Punto di inversione di marcia"
@@ -20976,15 +21403,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr "Porto turistico"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr "Modifica un porto turistico"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "Passerella"
@@ -20992,10 +21419,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "Modifica passerella"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr "Terminal traghetti"
@@ -21003,10 +21430,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr "Modifica terminal traghetti"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr "Rampa per la messa in acqua di imbarcazioni"
@@ -21016,20 +21443,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr "Modifica una rampa per la messa in acqua di imbarcazioni"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr "Trasporto"
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "Ferrovia"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "Ferrovia"
@@ -21037,5 +21464,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr "Modifica una ferrovia"
@@ -21044,139 +21471,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr "standard"
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr "tratto per lo smistamento delle merci"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr "tratto parallelo ad una ferrovia principale"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr "tratto per una società o ente"
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr "ferrovia"
+
+#. 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:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+msgid "Voltage"
+msgstr "Tensione"
+
+#. 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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr "Ferrovia a scartamento ridotto"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr "Modifica una ferrovia a scartamento ridotto"
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr "Monorotaia"
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr "Modifica una monorotaia"
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr "Ferrovia storica"
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr "Modifica una ferrovia storica"
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr "Metropolitana di superficie"
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr "Modifica una metropolitana di superficie"
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "Metropolitana"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "Modifica una metropolitana"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "Tramvia"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr "Modifica una tramvia"
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr "Autobus guidato"
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr "Modificare autobus guidato"
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "Ferrovia in disuso"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "Modifica una ferrovia in disuso"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr "Tipi opzionali"
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr "tratto per lo smistamento delle merci"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr "tratto parallelo ad una ferrovia principale"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr "tratto per una società o ente"
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr "Ferrovia a scartamento ridotto"
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr "Modifica una ferrovia a scartamento ridotto"
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr "Monorotaia"
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr "Modifica una monorotaia"
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr "Ferrovia storica"
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr "Modifica una ferrovia storica"
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr "Metropolitana di superficie"
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr "Modifica una metropolitana di superficie"
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "Metropolitana"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "Modifica una metropolitana"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "Tramvia"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr "Modifica una tramvia"
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr "Autobus guidato"
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr "Modificare autobus guidato"
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "Ferrovia in disuso"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "Modifica una ferrovia in disuso"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "Ferrovia abbandonata"
@@ -21185,5 +21851,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr "Passaggio a livello"
@@ -21192,5 +21858,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr "Crossing"
@@ -21200,5 +21866,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr "Tipo di attraversamento"
@@ -21206,5 +21872,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "Piattaforma ferroviaria girevole"
@@ -21213,10 +21879,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr "Impianto di risalita"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "Seggiovia"
@@ -21224,10 +21897,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr "Modifica una seggiovia"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr "Ski-lift"
@@ -21235,10 +21908,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr "Modifica uno ski-lift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "Cabinovia"
@@ -21246,10 +21919,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "Modifica una cabinovia"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr "Cabinovia"
@@ -21257,10 +21930,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr "Modifica cabinovia"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -21268,12 +21941,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr "Modifica stazione"
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "Stazione di rifornimento"
@@ -21283,9 +21969,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Modifica una stazione di rifornimento"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -21339,32 +22082,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "Orario di apertura"
@@ -21423,94 +22166,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lu-Ve 08:30-20:00"
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00"
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -21522,5 +22341,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -21530,5 +22349,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Modifica parcheggio"
@@ -21539,25 +22358,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr "Numero di riferimento"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "multi-piano"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "superficie"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr "sotterraneo"
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr "Parcheggio di interscambio"
@@ -21566,48 +22385,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "Tariffa"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr "Capacità (totale)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr "Spazi per disabili"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr "Spazi per le donne"
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr "Spazi per gli elementi da cui dipende"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Vedere il Wiki per un''altra capacità:[tipi]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "Autolavaggio"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "Modifica autolavaggio"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "Autofficina"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "Modifica autofficina"
@@ -21615,5 +22434,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "Noleggio"
@@ -21622,10 +22441,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "Modifica noleggio automobili"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr "Condivisione"
@@ -21633,5 +22452,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr "Modifica condivisione automobili"
@@ -21639,10 +22458,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "Modifica parcheggio per biciclette"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr "Capacità"
@@ -21651,15 +22470,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "Modifica noleggio biciclette"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Trasporto pubblico"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -21669,5 +22488,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -21675,5 +22494,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr "Riferimento UIC"
@@ -21681,5 +22500,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr "Stazione ferroviaria non presidiata"
@@ -21687,5 +22506,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr "Modifica stazione non presidiata"
@@ -21693,5 +22512,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "Fermata del tram"
@@ -21700,5 +22519,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "Modifica fermata del tram"
@@ -21706,5 +22525,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "Piattaforma ferroviaria"
@@ -21713,5 +22532,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "Modifica una piattaforma ferroviaria"
@@ -21723,5 +22542,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr "Riferimento (numero del tracciato)"
@@ -21729,10 +22548,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr "Area"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "Ingresso metropolitana"
@@ -21741,10 +22560,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "Modifica ingresso metropolitana"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr "Sedia a rotelle"
@@ -21753,5 +22572,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "Stazione degli autobus"
@@ -21760,5 +22579,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "Modifica una stazione degli autobus"
@@ -21766,5 +22585,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "Fermata dell''autobus"
@@ -21774,5 +22593,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "Modifica fermata dell''autobus"
@@ -21781,25 +22600,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr "Pensilina/ricovero"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "Panchina"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr "Pavimentazione tattile"
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr "Piattaforma fermata bus"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr "Modifica una piattaforma degli autobus"
@@ -21807,5 +22627,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "Taxi"
@@ -21813,5 +22633,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "Stazione dei taxi"
@@ -21819,32 +22639,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "Aeroporto"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr "Modifica aeroporto"
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr "IATA"
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr "ICAO"
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+msgid "Beacon"
+msgstr "Torre radio"
+
+#. 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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr "Viaggio"
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Alloggiamento"
@@ -21856,5 +22771,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -21863,15 +22778,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "Modifica hotel"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "Stelle"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr "Motel"
@@ -21879,20 +22794,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr "Modifica Motel"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr "Guest House"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr "Modifica Guest House"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "Casetta (chalet)"
@@ -21900,10 +22815,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr "Modifica casetta (chalet)"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr "Ostello"
@@ -21911,30 +22826,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr "Modifica ostello"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr "Rifugio alpino"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr "Modifica rifugio alpino"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr "Area caravan e camper"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr "Modifica area caravan e camper"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "Campeggio"
@@ -21942,10 +22857,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr "Modifica campeggio"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Cibo+bevande"
@@ -21956,5 +22871,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ristorante"
@@ -21962,5 +22877,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "Modifica ristorante"
@@ -21968,5 +22883,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr "Cucina"
@@ -21974,61 +22889,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "italiana"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "cinese"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "greca"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "tedesca"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "indiana"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "provinciale"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "turca"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "asiatica"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "tailandese"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "messicana"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "giapponese"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "Fast food"
@@ -22036,9 +22963,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "Modifica fast food"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "Caffetteria"
@@ -22046,9 +22981,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "Caffetteria"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "Pub"
@@ -22056,18 +22991,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "Modifica Pub"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr "Modifica Biergarten"
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr "Bar"
@@ -22075,9 +23010,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr "Modifica Bar"
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "Club notturno"
@@ -22085,24 +23020,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "Modifica club notturno"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr "Attrazione turistica"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr "Modifica attrazione turistica"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Museo"
@@ -22110,9 +23045,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Modifica museo"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Zoo"
@@ -22121,9 +23056,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Modifica zoo"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "Punto panoramico"
@@ -22131,24 +23066,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "Modifica punto panoramico"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr "Torre di avvistamento"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "Parco divertimenti"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr "Modifica parco divertimenti"
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "Opera d''arte"
@@ -22156,5 +23091,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "Modifica opera d''arte"
@@ -22162,19 +23097,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr "Ufficio informazioni"
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Mappa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr "Grado di dettaglio"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr "topografico"
@@ -22212,5 +23147,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -22218,28 +23153,28 @@
 msgstr "strada"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr "schema"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr "Area visualizzata"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr "luogo"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr "città"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr "provincia"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr "Descrizione più specifica"
@@ -22249,5 +23184,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr "Percorsi segnalati per:"
@@ -22255,5 +23190,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr "Percorso escursionistico"
@@ -22261,6 +23196,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -22268,5 +23203,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr "Mountain bike"
@@ -22274,6 +23209,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "Sci"
@@ -22281,5 +23216,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr "Equitazione"
@@ -22287,46 +23222,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr "... altre modalità di trasporto possibili"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr "Tabellone informativo"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr "Contenuto del cartello"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr "avviso"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "storia"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr "natura"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr "fauna"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr "piantine"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr "Indicatore stradale"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr "Terminale informazioni"
@@ -22334,29 +23269,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr "Descrizione dettagliata"
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr "Audio-guida"
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr "Audio-guida tramite cellulare?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr "Numero di telefono"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr "Altri punti informativi"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr "Modifica pensilina/ricovero"
@@ -22364,25 +23299,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr "Caminetto"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "Area picnic"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "Modifica area picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Luoghi storici"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Castello"
@@ -22391,19 +23326,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Modifica castello"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Rovine"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Modifica rovine"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Sito archeologico"
@@ -22412,9 +23347,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "Modifica sito archeologico"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "Campo di battaglia"
@@ -22422,10 +23357,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "Modifica campo di battaglia"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr "Sito paleontologico"
@@ -22433,5 +23368,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr "Modifica sito paleontologico"
@@ -22439,15 +23374,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "Modifica monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "Memoriale"
@@ -22455,55 +23390,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "Modifica memoriale"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr "Crocefisso"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr "Crocefisso"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr "Edicola votiva"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr "Modifica edicola votiva"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr "Pietra limite"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr "Modifica pietra limite"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Svago"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "Parco acquatico"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "Modifica parco acquatico"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Parco giochi"
@@ -22511,35 +23446,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Modifica parco giochi"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Riserva di pesca"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "Modifica riserva di pesca"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr "Articoli sportivi"
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr "Strutture sportive"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Stadio"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Modifica stadio"
@@ -22553,6 +23488,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "seleziona uno sport:"
@@ -22944,6 +23879,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -22977,225 +23912,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr "polivalente"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "tiro con l''arco"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr "atletica"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "football_australiano"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "pallacanestro"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr "boccie"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr "canoa"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "arrampicata"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr "reti_cricket"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr "cinodromo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr "sport_equestri"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "football_americano"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "ginnastica"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr "ippodromo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr "autodromo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr "racchette"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "poligono_di_tiro"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr "pattinaggio"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "comprensorio_sciistico"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "calcio"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "piscina"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "ping_pong"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "Centro sportivo"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "Modifica centro sportivo"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr "Campo sportivo"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr "Modifica campo sportivo"
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr "Circuito (pista)"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr "Modifica circuito (pista)"
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "Campo da golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "Modifica campo da golf"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "Modifica minigolf"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr "Struttura polivalente"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr "Modifica struttura polivalente"
@@ -23234,21 +24169,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "tipo"
@@ -23287,203 +24222,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr "campo_sportivo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "centro_sportivo"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "stadio"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr "tracciato"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr "Modifica bowling"
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr "Atletica"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr "Modifica atletica"
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "Tiro con l''arco"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "Modifica tiro con l''arco"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "Arrampicata"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "Modifica arrampicata"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr "Canoa"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr "Modifca canoa"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr "Modifica ciclismo"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "Corse dei cani"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr "Modifica corse dei cani"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr "Equitazione"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr "Modificare Equitazione"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr "Ippodromo"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr "Modifica ippodromo"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "Ginnastica"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr "Modificare Ginnastica"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "Sport motoristici"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr "Modifica Sport Motoristici"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr "Pattinaggio"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr "Modificare Pattinaggio"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr "Modificare Skateboard"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "Piscina"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "Modificare Nuoto"
@@ -23491,56 +24426,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr "Modificare Sci"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr "Tipo di pista"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr "Sci alpino"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr "Sci nordico"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr "Difficoltà"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr "principante"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr "facile"
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr "intermedio"
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr "avanzato"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr "esperto"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "Poligono di tiro"
@@ -23548,182 +24479,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "Modifica poligono di tiro"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "Sport (Pallone)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "Calcio"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr "Modifica Calcio"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "Football"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr "Modifica football"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr "Football australiano"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr "Modifica football australiano"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr "Modifica Baseball"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "Pallacanestro"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "Modifica Pallacanestro"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr "Modifica Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "campo_da_golf"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr "Boule (sport popolare in Francia)"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr "Modifica boule (sport popolare in Francia)"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr "Bocce"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr "Modifica Bocce"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr "Modifica Cricket"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr "Reti per Cricket"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr "Modifica Reti per Cricket"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr "Modifica croquet"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "Modifica Hockey"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr "Modifica Pelota"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr "Modifica racquet"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr "Modifica Rugby"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "Tennis da tavolo"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "Modifica Tenniis da tavolo"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "Modifica Tennis"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr "Artificiale"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Edifici"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "Palazzo"
@@ -23731,5 +24662,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Edificio pubblico"
@@ -23737,10 +24668,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Modifica edificio pubblico"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "Municipio"
@@ -23748,10 +24679,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Modifica municipio"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Ambasciata"
@@ -23759,10 +24690,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Modifica ambasciata"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "Tribunale"
@@ -23771,10 +24702,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Modifica Palazzio del tribunale"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Prigione"
@@ -23783,10 +24714,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Modifica Prigione"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Polizia"
@@ -23796,10 +24727,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Modifica Polizia"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "Vigili del fuoco"
@@ -23808,10 +24739,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Modifica vigili del fuoco"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Ufficio Postale"
@@ -23819,5 +24750,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Modifica Ufficio Postale"
@@ -23825,15 +24756,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "Asilo infantile"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "Modifica asilo infantile"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "Scuola"
@@ -23841,10 +24772,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "Modifica scuola"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "Università"
@@ -23852,10 +24783,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "Modifica Università"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "Scuola superiore"
@@ -23863,5 +24794,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "Modifica scuola superiore"
@@ -23869,5 +24800,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Cinema"
@@ -23876,10 +24807,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Modifica Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "Biblioteca"
@@ -23888,9 +24819,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Modifica biblioteca"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "Centro Artistico"
@@ -23898,10 +24829,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "Modifica centro d''arte"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Teatro"
@@ -23910,10 +24841,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Modifica Teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "Luogo di culto"
@@ -23923,5 +24854,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "Modifica Luogo di culto"
@@ -23930,6 +24861,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "Religione"
@@ -23938,66 +24869,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr "Bahaista"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "Buddista"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "Cristiana"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "Induista"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr "Giainista"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "Ebraica"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "Mussulmana"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr "Sikh"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr "Spiritualista"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr "Taoista"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr "Unitariana"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr "Zoroastrista"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr "Denominazione"
@@ -24006,81 +24937,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr "Anglicana"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "Battista"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "Cattolica"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr "Evangelica"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr "Testimoni di Geova"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "Luterana"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr "Metodista"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr "Mormone"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "Ortodossa"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr "Pentecostale"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr "Prebiteriana"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "Protestante"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr "Quacchera"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr "Sciita"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr "Sunnita"
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Indirizzi"
@@ -24089,5 +25020,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Modifica dati indirizzo"
@@ -24095,5 +25026,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "Numero civico"
@@ -24101,25 +25032,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "Nome Casa"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Nome Strada"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "Nome città"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Codice postale"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "Codice nazione"
@@ -24128,5 +25059,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "Modifica interpolazione indirizzo"
@@ -24134,61 +25065,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr "Schema numerazione"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "dispari"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "pari"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr "alfabetico"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr "Artificiale"
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "Fabbrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "Modifica fabbrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Modifica torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr "Tipo di torre"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr "telecomunicazioni"
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr "osservazione"
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr "Altezza (metri)"
@@ -24196,25 +25127,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Torre idrica"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Modifica torre idrica"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "Gasometro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "Modifica gasometro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "Faro"
@@ -24222,10 +25153,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Modifica faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Mulino a vento"
@@ -24233,10 +25164,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Modifica mulino a vento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Conduttura"
@@ -24245,37 +25176,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Modifica conduttura"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
+msgid "gas"
+msgstr "gas"
+
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr "calore"
+
+#: build/trans_presets.java:2353
 msgid "oil"
 msgstr "petrolio"
 
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-msgid "gas"
-msgstr "gas"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr "liquami"
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr "calore"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr "qualunque sostanza"
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr "subacqueo"
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr "sopra il suolo"
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "Depuratore acqua"
@@ -24285,10 +25216,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "Modifica depuratore acqua"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Gru permanente"
@@ -24296,21 +25227,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Modifica gru permanente"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr "Torre radio"
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr "Modifica torre radio"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "Punto geodetico o altra stazione fissa"
@@ -24318,10 +25244,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "Modifica punto geodetico o altra stazione fissa"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "Telecamera di sorveglianza"
@@ -24329,11 +25255,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Modifica telecamera di sorveglianza"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "Centrale elettrica"
@@ -24343,35 +25281,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "Modifica centrale elettrica"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "eolica"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "idroelettrica"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "a combustibile fossile"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "fissione nucleare"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "carbone"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "Stazione elettrica"
@@ -24380,10 +25318,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "Modifica stazione elettrica"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "Sottostazione elettrica"
@@ -24392,5 +25330,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "Modifica sottostazione elettrica"
@@ -24398,10 +25336,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr "Riferimento linea"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "Pilone (elettricità)"
@@ -24412,23 +25350,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "Modifica pilone (elettricità)"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr "traliccio"
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr "palo"
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr "Riferimento torre"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "Linea elettrica"
@@ -24437,79 +25375,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "Modifica linea elettrica"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr "Tipo di linea"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr "linea"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr "linea minore"
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "Tensione"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr "Quantità di cavi"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr "singola"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr "doppia"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr "tripla"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr "quadrupla"
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr "Servizi"
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Bagni pubblici"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "Cassetta Postale"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Telefono"
@@ -24518,5 +25451,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Modifica Telefono"
@@ -24524,5 +25457,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Monete"
@@ -24530,5 +25463,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "Note"
@@ -24536,5 +25469,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr "Portafogli elettronici e carte di debito"
@@ -24542,5 +25475,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr "Carte di debito"
@@ -24548,15 +25481,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Carte di credito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Carte telefoniche"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Riciclaggio"
@@ -24565,5 +25498,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Modifica Stazione di riciclaggio"
@@ -24571,63 +25504,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "Batterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "Lattine"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "Vestiti"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "Vetro"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "Carta"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "Rottami metallici"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+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:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr "Schienale"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr "Materiale"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr "pietra"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr "plastica"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr "Colore"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr "nero"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr "marrone"
@@ -24706,5 +25650,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -24714,31 +25658,31 @@
 msgstr "verde"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr "rosso"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr "blu"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr "grigio"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr "bianco"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr "Quantità di posti"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr "Postazione di caccia"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr "Modifica una postazione di caccia"
@@ -24747,30 +25691,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "Modifica Albero"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr "basso"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr "mezzo"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr "completo"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr "Nascondi"
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr "Blocco"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "Fontana"
@@ -24779,10 +25723,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "Modifica Fontana"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "Acqua potabile"
@@ -24791,10 +25735,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Modifica acqua potabile"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr "Culla per la vita"
@@ -24802,15 +25759,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr "Modifica culla per la vita"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Negozi"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr "Concessionaria"
@@ -24818,10 +25775,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "Modifica concessionaria"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr "Negozio di biciclette"
@@ -24830,28 +25787,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "Modifica negozio di biciclette"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "Supermercato"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "Modifica Supermercato"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr "Farmacista"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr "Modifica farmacista"
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr "Minimarket"
@@ -24859,9 +25816,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr "Modifica minimarket"
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "Chiosco"
@@ -24869,27 +25826,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "Modificia Chiosco"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr "Libreria"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr "Modifica libreria"
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr "Agenzia di viaggi"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr "Modifica agenzia di viaggi"
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "Distributore automatico"
@@ -24897,5 +25854,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "Modifica Distributore automatico"
@@ -24903,88 +25860,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "Distributore automatico"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr "Biglietti trasporto pubblico"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr "Orari trasporto pubblico"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr "Biglietti per il parcheggio"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "Alimenti"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "Bevande"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "Dolci"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "Sigarette"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "fotografie"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "Cibo per animali"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "Giornali"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "giocattoli"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "francobolli"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "Schede SIM"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr "buoni_telefonici"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr "buoni"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "preservativi"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr "assorbenti"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr "Sacchetto per escrementi"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr "Conto o carta fedeltà"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "Macellaio"
@@ -24992,9 +25949,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Modifica Macellaio"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "Panificio"
@@ -25002,9 +25959,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Modifica Panificio"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "Fiorista"
@@ -25012,18 +25969,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "Modifica Fiorista"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr "Prodotti biologici"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr "Modifica negozio di prodotti biologici"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr "Alcolici (non in Italia)"
@@ -25031,54 +25988,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr "Modifica negozio di alcolici (non in Italia)"
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr "Bevande"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr "Modifica negozio di bevande"
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "Modifica negozio di informatica"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr "Elettronica"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "Modifica Negozio di Elettronica"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr "Hi-Fi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr "Modifica negozio di Hi-Fi"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr "Mobilia"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "Modifica Negozio di Mobilia"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr "Giardinaggio"
@@ -25086,9 +26043,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr "Modifica giardinaggio"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr "Ferramenta"
@@ -25096,9 +26053,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr "Modifica Negozio di Ferramenta"
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "Fai-da-te"
@@ -25106,54 +26063,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "Modifica negozio Fai-da-te"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr "Cartoleria"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr "Modifica cartoleria"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "Parrucchiere/barbiere"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "Modifica parrucchiere/barbiere"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr "Calzature"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "Modifica Negozio di Scarpe"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr "Giocattoli"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "Modifica Negozio di Giocattoli"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr "Videoteca"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr "Modifica videoteca"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Lavanderia a secco"
@@ -25161,9 +26118,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Modifica Lavanderia a secco"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Lavanderia"
@@ -25171,9 +26128,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Modifica lavanderia"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr "Sport all''aperto"
@@ -25181,28 +26138,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr "Modifica sport all''aperto"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr "Modifica articoli sportivi"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr "Ottico"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "Modifica Ottico"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Contanti"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Banca"
@@ -25210,14 +26167,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Modifica banca"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "Bancomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Cambiavalute"
@@ -25225,5 +26182,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Modifica cambiavalute"
@@ -25231,15 +26188,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Modifica bancomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Salute"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "Ambulatorio"
@@ -25247,18 +26204,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "Modifica ambulatorio"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "Modifica dentista"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Farmacia"
@@ -25266,5 +26223,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Modifica Farmacia"
@@ -25272,9 +26229,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr "Vendita medicinali con obbligo di prescrizione"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Ospedale"
@@ -25282,10 +26239,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Modifica Ospedale"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr "Colonnina SOS"
@@ -25294,5 +26251,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr "Modifica colonnina SOS"
@@ -25301,20 +26258,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr "Numero del punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr "Nome del punto"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "Numero di telefono"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Usare prefisso internazionale, es. +12-345-67890)"
@@ -25322,5 +26279,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -25329,64 +26286,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "Modifica veterinario"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr "Geografia"
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Luoghi"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Continente"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Modifica continente"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "Nazione"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Modifica nazione"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "Regione"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "Modifica regione"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "Provincia"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "Modifica provincia"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr "Contea (in Italia NON usare)"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr "Modifica contea (in Italia NON usare)"
@@ -25394,15 +26351,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "Città"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "Modifica città"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "Paese"
@@ -25410,10 +26367,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "Modifica paese"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "Quartiere"
@@ -25421,25 +26378,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "Modifica quartiere"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Frazione"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Modifica frazione"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "Borgo"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "Modifica borgo"
@@ -25447,5 +26404,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr "Località (luogo con nome, non popolato)"
@@ -25453,10 +26410,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr "Modifica località (luogo con nome, non popolato)"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "Isola"
@@ -25464,10 +26421,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Modifica isola"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr "Isoletta"
@@ -25475,5 +26432,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr "Modifica isoletta"
@@ -25481,5 +26438,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "Entrata di una grotta/caverna"
@@ -25487,10 +26444,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "Modifica entrata di una grotta/caverna"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Picco montuoso"
@@ -25498,10 +26455,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Modifica picco montuoso"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "Ghiacciaio"
@@ -25509,10 +26466,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "Modifica Ghiacciaio"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "Vulcano"
@@ -25520,70 +26477,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "Modifica vulcano"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Confini"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "Nazionale"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "Modifica confine nazionale"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "Amministrativo"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "Modifica confine amministrativo"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr "Civile"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr "Modifica confine civile"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr "Politico"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "Modifica confine politico"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr "Parco nazionale"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "Modifica Confine Parco Nazionale"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Uso del terreno"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Albero"
@@ -25592,15 +26549,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Modifica albero singolo"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "Nome Botanico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "Bosco"
@@ -25609,5 +26566,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "Modifica bosco"
@@ -25615,17 +26572,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "Conifere"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "deciduo (caducifoglie)"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "Mista"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "Foresta"
@@ -25634,14 +26591,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "Modifica area di foresta"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "Riserva naturale"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "Modifica riserva naturale"
@@ -25649,25 +26606,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr "Ghiaione"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr "Modifica ghiaione"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr "Boscaglia"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr "Modifica boscaglia"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr "Prato alpino"
@@ -25675,10 +26632,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr "Modifica prato alpino"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr "Brughiera"
@@ -25686,5 +26643,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "Modifica brughiera"
@@ -25692,5 +26649,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr "Aia"
@@ -25699,45 +26656,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr "Modifica aia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "Area agricola"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr "Modifica area agricola"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr "Prato"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr "Modifica area a prato"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "Vigna"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "Modifica area di vigneto"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr "Area pubblica concessa ai cittadini per la realizzazione di orti"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -25746,25 +26703,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "Giardino"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "Modifica giardino"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "Erba"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr "Modifica area di prato"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr "Village Green"
@@ -25772,10 +26729,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr "Modifica Village Green"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr "Area comune (UK)"
@@ -25783,20 +26740,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr "Modifica area comune (UK)"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "Parco"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "Modifica parco"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr "Area di svago"
@@ -25804,5 +26761,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr "Modifica area di svago"
@@ -25810,15 +26767,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "Area residenziale"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr "Modifica area residenziale"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "Cimitero"
@@ -25826,9 +26783,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Modifica Cimitero"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "Cimitero"
@@ -25836,39 +26793,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "Modifica area di cimitero (esteso)"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "Commerciale (negozi)"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr "Modifica area commerciale (negozi)"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "Commerciale (uffici)"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr "Modifica area commerciale (uffici)"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "Industriale"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr "Modifica area industriale"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr "Deposito materiale ferroviario"
@@ -25876,15 +26833,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr "Modifica deposito materiale ferroviario"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "Militare"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr "Modifica area militare"
@@ -25892,50 +26849,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "Area in costruzione"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "Modifica area in costruzione"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr "Ridestinazione d''uso"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr "Modifica area di ridestinazione d''uso"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr "Area agricola destinata alla costruzione"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr "Modifica area agricola destinata alla costruzione"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr "Discarica"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr "Modifica area di discarica"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "Cava"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "Modifica area di cava/miniera"
@@ -25945,5 +26902,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr "Modifica un multi-poligono"
@@ -25952,10 +26909,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr "segmento esterno"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr "segmento interno"
@@ -25963,5 +26920,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr "Divieto di svolta"
@@ -25970,5 +26927,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr "Modifica un divieto di svolta"
@@ -25976,34 +26933,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr "Divieto"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr "no svolta a sinistra"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr "no svolta a destra"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr "non diritto"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr "no inversione di marcia"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr "solo svolta a destra"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr "solo svolta a sinistra"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr "solo diritto"
@@ -26012,15 +26969,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr "dal percorso"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr "attraverso il nodo o percorso"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr "verso il percorso"
@@ -26028,5 +26985,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr "Percorso"
@@ -26035,5 +26992,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr "Modifica un percorso"
@@ -26041,5 +26998,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr "Tipo di percorso"
@@ -26130,5 +27087,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -26138,17 +27095,17 @@
 msgstr "bicicletta"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr "strada"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr "traghetto"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr "sci"
@@ -26208,5 +27165,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -26215,9 +27172,9 @@
 msgstr "pedone"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr "deviazione"
@@ -26231,10 +27188,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "metropolitana"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr "Descrizione del simbolo"
@@ -26242,31 +27199,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr "Rete"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr "Stato del percorso"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr "proposto"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr "alternativo"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr "temporaneo"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr "collegamento"
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr "Colore (esadecimale)"
@@ -26275,107 +27232,32 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr "segmento di percorso"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr "segmento diretto"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr "segmento opposto"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr "punto di fermata"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr "punto di fermata diretto"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 msgid "backward halt point"
 msgstr "punto di fermata opposto"
-
-#. <!--
-#. 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 "standard"
 
 #. mappaint style named "standard"
@@ -26911,77 +27793,4 @@
 msgid "highway_track"
 msgstr "tracciato stradale"
-
-#. 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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
-msgstr "ferrovia"
 
 #. color rail
@@ -27369,7 +28178,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "Battista"
+msgstr ""
 
 #. color manmade
@@ -30508,80 +31316,642 @@
 msgstr "Sicilia - Italia"
 
-#~ msgid "The plugin could not be removed. Probably it was already disabled"
+#~ msgid "No data imported."
+#~ msgstr "Nessun dato importato."
+
+#~ msgid "Load Selection"
+#~ msgstr "Carica selezione"
+
+#~ msgid "Refresh the selection list."
+#~ msgstr "Ricarica la lista di selezione"
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Selezionare almeno un compito per scaricare"
+
+#~ msgid "Data Layer"
+#~ msgstr "Livello dati"
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
 #~ msgstr ""
-#~ "L''estensione non può essere rimossa. Probabilmente è stata già "
-#~ "disabilitata"
+#~ "È possibile modificare solo le pagine di aiuto dell'Aiuto in linea di JOSM"
+
+#~ msgid "Move"
+#~ msgstr "Sposta"
+
+#~ msgid "unnamed"
+#~ msgstr "Senza nome"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Nessun documento è aperto per cui non c'è niente da salvare."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "L'estensione del file è sconosciuta."
+
+#~ msgid "Change"
+#~ msgstr "Cambia"
+
+#~ msgid "Resolve {0} conflicts in {1} objects"
+#~ msgstr "Risolvere {0} conflitti in {1} oggetti"
+
+#~ msgid "Rotate"
+#~ msgstr "Ruota"
+
+#~ msgid "different"
+#~ msgstr "diverso"
+
+#~ msgid "true"
+#~ msgstr "vero"
+
+#~ msgid "false"
+#~ msgstr "falso"
+
+#~ msgid "position"
+#~ msgstr "posizione"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} oggetto causa conflitti:"
+#~ msgstr[1] "{0} oggetti causano conflitti:"
+
+#~ msgid "my version:"
+#~ msgstr "versione locale:"
+
+#~ msgid "their version:"
+#~ msgstr "versione remota:"
+
+#~ msgid "resolved version:"
+#~ msgstr "versione risolta:"
+
+#~ msgid "Resolve Conflicts"
+#~ msgstr "Resolvi conflitti"
+
+#~ msgid "Click Reload to refresh list"
+#~ msgstr "Fare clic su Ricarica per aggiornare la lista"
+
+#~ msgid "Object"
+#~ msgstr "Oggetto"
+
+#~ msgid "Date"
+#~ msgstr "Data"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Riporta lo stato di tutti gli oggetti correntemente selezionati alla "
+#~ "versione selezionata nella lista della cronologia."
+
+#~ msgid "Delete the selected layer."
+#~ msgstr "Cancella il livello selezionato."
+
+#~ msgid "Occupied By"
+#~ msgstr "Occupato da"
+
+#~ msgid "Tags (empty value deletes tag)"
+#~ msgstr "Etichette (un valore vuoto cancella l'etichetta)"
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Aggiungi tutti gli oggetti selezionati come membri"
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "Si sono verificati dei conflitti durante l'importazione."
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Errore di scansione nella risposta del server."
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Impossibile connettersi al server."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Per prima cosa, scegli un segnalibro."
+
+#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
+#~ msgstr ""
+#~ "Per spostare, ingrandire e rimpicciolire la mappa puoi usare il mouse "
+#~ "oppure premere Ctrl e le frecce, il punto (.) e la virgola (,)."
+
+#~ msgid "Images for {0}"
+#~ msgstr "Immagini per {0}"
+
+#~ msgid "Read GPX..."
+#~ msgstr "Leggi GPX..."
+
+#~ msgid "No time for point {0} x {1}"
+#~ msgstr "Informazioni di tempo non disponibili per il punto {0} x {1}"
+
+#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
+#~ msgstr "Impossibile leggere il tempo \"{0}\" per il punto {1} x {2}"
+
+#~ msgid "No images with readable timestamps found."
+#~ msgstr "Non è stata trovata nessuna immagine con una data leggibile."
+
+#~ msgid "GPS start: {0}"
+#~ msgstr "GPS inizio: {0}"
+
+#~ msgid "GPS end: {0}"
+#~ msgstr "GPS fine: {0}"
+
+#~ msgid "current delta: {0}s"
+#~ msgstr "differenza attuale: {0}s"
+
+#~ msgid "timezone difference: "
+#~ msgstr "differenza fuso orario: "
+
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "immagine"
+#~ msgstr[1] "immagini"
+
+#~ msgid "{0} within the track."
+#~ msgstr "{0} in questa traccia."
+
+#~ msgid "Sync clock"
+#~ msgstr "Sincronizza tempo"
+
+#~ msgid "The date in file \"{0}\" could not be parsed."
+#~ msgstr "Impossibile leggere la data nel file \"{0}\"."
+
+#~ msgid "There is no EXIF time within the file \"{0}\"."
+#~ msgstr "Orario non presente nei dati EXIF del file \"{0}\"."
+
+#~ msgid "Image"
+#~ msgstr "Immagine"
+
+#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+#~ msgstr "Inserisci la data visualizzata (mm/gg/aaaa HH:MM:SS)"
+
+#~ msgid "Time entered could not be parsed."
+#~ msgstr "Impossibile decodificare l'orario inserito."
+
+#~ msgid "name"
+#~ msgstr "nome"
+
+#~ msgid "Open file (as raw gps, if .gpx)"
+#~ msgstr "Apri il file (come gps grezzo se .gpx)"
+
+#~ msgid ""
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
+#~ "some data before --selection"
+#~ msgstr ""
+#~ "I parametri sono letti nell'ordine in cui sono specificati,\n"
+#~ "quindi assicurati di caricare dei dati prima di indicare una selezione."
+
+#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
+#~ msgstr "Invece di --download=<zona> puoi utilizzare osm://<zona>\n"
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Connessione al server OSM..."
+
+#~ msgid "Error while parsing"
+#~ msgstr "Impossibile interpretare"
+
+#~ msgid "File not found"
+#~ msgstr "File non trovato"
+
+#~ msgid "Update"
+#~ msgstr "Aggiorna"
+
+#~ msgid "Add either site-josm.xml or Wiki Pages."
+#~ msgstr "Aggiungi sia site-josm.xml che le pagine Wiki."
+
+#~ msgid "The base URL for the OSM server (REST API)"
+#~ msgstr "L'URL di base per il server OSM (API REST)"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Nome utente (email) per l'account di OSM."
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "Password per l'account di OSM. Lasciare vuoto per non memorizzare la "
+#~ "password."
+
+#~ msgid "Incorrect password or username."
+#~ msgstr "Nome utente o password errati."
+
+#~ msgid "Enter Password"
+#~ msgstr "Inserire la password"
+
+#~ msgid "Error during parse."
+#~ msgstr "Errore nella scansione."
+
+#~ msgid "Unknown version"
+#~ msgstr "Versione sconosciuta"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Trovato <nd> elemento in non-percorso."
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> ha zero ref"
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ msgstr ""
+#~ "Suggerimento: alcuni cambiamenti derivano dal caricamento dei nuovi dati "
+#~ "sul server."
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Impossibile scaricare il plugin: {0} da {1}"
+
+#~ msgid "Do not show again"
+#~ msgstr "Non mostrare di nuovo"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Impossibile leggere dal server i risultati della ricerca del luogo"
+
+#~ msgid "Navigation"
+#~ msgstr "Navigazione"
+
+#~ msgid "osmarender options"
+#~ msgstr "Opzioni osmarender"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Unire i nodi con diffenti appartenenze?"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Errore durante il caricamento della pagina {0}"
+
+#~ msgid "Open in Browser"
+#~ msgstr "Apri nel Browser"
+
+#~ msgid "JOSM Online Help"
+#~ msgstr "Guida in linea di JOSM"
+
+#~ msgid ""
+#~ "Internal Error: cannot check conditions for no layer. Please report this "
+#~ "as a bug."
+#~ msgstr ""
+#~ "Errore Interno: impossibile controllare le condizioni dei layer. Segnala "
+#~ "questo come bug."
+
+#~ msgid "Revert"
+#~ msgstr "Ripristina"
+
+#~ msgid "Set the language."
+#~ msgstr "Imposta la lingua."
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Conflitto tra relazioni"
+
+#~ msgid "Split way segment"
+#~ msgstr "Dividi il segmento del percorso"
+
+#~ msgid "Merging conflicts."
+#~ msgstr "Unisci i conflitti."
+
+#~ msgid "Proxy server host"
+#~ msgstr "Host del server proxy"
+
+#~ msgid "Anonymous"
+#~ msgstr "Anonimo"
+
+#~ msgid "Enable proxy server"
+#~ msgstr "Abilita il server proxy"
+
+#~ msgid "Proxy server port"
+#~ msgstr "Porta del server poxy"
+
+#~ msgid "Proxy server password"
+#~ msgstr "Password del server proxy"
+
+#~ msgid ""
+#~ "Server returned internal error. Try a reduced area or retry after waiting "
+#~ "some time."
+#~ msgstr ""
+#~ "Il server ha restituito un errore interno. Prova con un'area piccola o "
+#~ "aspetta prima di riprovare."
+
+#~ msgid "Images with no exif position"
+#~ msgstr "Immagini senza posizione exif"
+
+#~ msgid "All images"
+#~ msgstr "Tutte le immagini"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "AgPifoJ - Geotagged pictures"
+#~ msgstr "AgPifoJ - fotografie con geotag"
+
+#~ msgid "Adjust the position of the WMS layer"
+#~ msgstr "Aggiusta la posizione dl layer WMS"
+
+#~ msgid "help"
+#~ msgstr "aiuto"
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "I nodi selezionati appartengono a relazioni differenti. Vuoi comunque "
+#~ "unirli?"
+
+#~ msgid "Expected closing parenthesis."
+#~ msgstr "Era attesa una parentesi chiusa."
+
+#~ msgid "All the ways were empty"
+#~ msgstr "Tutti i percorsi erano vuoti"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (correzione GNOME)"
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "Metacarta Map Rectifier image id"
+#~ msgstr "Id dell'immagine Metacarta Map Rectifier"
+
+#~ msgid "Not yet tagged images"
+#~ msgstr "Immagini ancora senza etichetta"
+
+#~ msgid ""
+#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
+#~ msgstr ""
+#~ "<html>Posso fare una fotografia al mio ricevitore GPS.<br>Può questo "
+#~ "essere di aiuto?</html>"
+
+#~ msgid "GPX Track loaded"
+#~ msgstr "Tracciato GPS caricato"
+
+#~ msgid "Boat"
+#~ msgstr "Barca"
+
+#~ msgid "Motorboat"
+#~ msgstr "Barca a motore"
 
 #~ msgid "Bridleway"
 #~ msgstr "Percorso per equitazione"
 
+#~ msgid "Edit Hiking"
+#~ msgstr "Modifica percorso escursionistico"
+
+#~ msgid "Mountain Hiking"
+#~ msgstr "Percorso escursionistico montano"
+
+#~ msgid "Edit Mountain Hiking"
+#~ msgstr "Modifica percorso escursionistico montano"
+
+#~ msgid "Edit Demanding Mountain Hiking"
+#~ msgstr "Modifica percorso escursionistico montano difficile"
+
+#~ msgid "Edit Alpine Hiking"
+#~ msgstr "Modifica percorso escursionistico alpino"
+
+#~ msgid "Shop"
+#~ msgstr "Negozio"
+
+#~ msgid "Edit Station"
+#~ msgstr "Modifica stazione"
+
+#~ msgid "Help / About"
+#~ msgstr "Aiuto / Informazioni su"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Convalida la selezione corrente oppure tutto l'insieme dei dati."
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Usa la preimpostazione ''{0}''"
+
+#~ msgid "Combine ways with different memberships?"
+#~ msgstr "Unire i percorsi con diverse appartenenze?"
+
+#~ msgid ""
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
+#~ msgstr ""
+#~ "I percorsi selezionati appartengono a relazioni differenti. Vuoi comunque "
+#~ "unirli?"
+
+#~ msgid "Charge"
+#~ msgstr "Costo"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Inserire la stringa da cercare"
+
+#~ msgid "error requesting update"
+#~ msgstr "errore nella richiesta di aggiornamento"
+
+#~ msgid "requested: {0}"
+#~ msgstr "richiesta: {0}"
+
+#~ msgid "error loading metadata"
+#~ msgstr "errore nel caricamento dei metadati"
+
+#~ msgid "rectifier id={0}"
+#~ msgstr "identificativo rectifier={0}"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Usa la preimpostazione \"{0}\" del gruppo \"{1}\""
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Sorgenti preimpostazioni etichette"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Sorgente preimpostazioni etichette"
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr ""
+#~ "Aggiunge una nuova sorgente di preimpostazioni di etichette alla lista."
+
+#~ msgid "Show Tile Status"
+#~ msgstr "Mostra lo stato dei tasselli"
+
+#~ msgid "Downloading..."
+#~ msgstr "Scaricamento in corso..."
+
+#~ msgid ""
+#~ "Activating the updated plugins failed. Check if JOSM has the permission "
+#~ "to overwrite the existing ones."
+#~ msgstr ""
+#~ "L'attivazione delle estensioni aggiornate è fallita. Controllare se JOSM "
+#~ "ha i permessi per sovrascrivere quelle esistenti."
+
+#~ msgid "Downloaded plugin information from {0} site"
+#~ msgid_plural "Downloaded plugin information from {0} sites"
+#~ msgstr[0] "Informazioni sulle estensioni scaricate da {0} sito"
+#~ msgstr[1] "Informazioni sulle estensioni scaricate da {0} siti"
+
+#~ msgid "All installed plugins are up to date."
+#~ msgstr "Tutte le estensioni sono state aggiornate."
+
+#~ msgid ""
+#~ "There were problems with the following plugins:\n"
+#~ "\n"
+#~ " {0}"
+#~ msgstr ""
+#~ "Ci sono stati dei problemi con le seguenti estensioni:\n"
+#~ "\n"
+#~ "{0}"
+
+#~ msgid "Plugin not found: {0}."
+#~ msgstr "Estensione non trovata: {0}."
+
+#~ msgid "Update Plugins"
+#~ msgstr "Aggiorna estensioni"
+
+#~ msgid "Download missing plugins"
+#~ msgstr "Scarica le estensioni mancanti"
+
+#~ msgid "WMS Plugin Help"
+#~ msgstr "Aiuto sull'estensione WMS"
+
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr ""
+#~ "Impossibile rimuovere l'estensione. Riportate il problema alle persone da "
+#~ "cui si è ottenuto JOSM."
+
+#~ msgid "zoom"
+#~ msgstr "livello di ingrandimento"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "Track Grade 3"
+
+#~ msgid "Track Grade 2"
+#~ msgstr "Track Grade 2"
+
+#~ msgid "Track Grade 1"
+#~ msgstr "Track Grade 1"
+
+#~ msgid "Track Grade 4"
+#~ msgstr "Track Grade 4"
+
+#~ msgid "Track Grade 5"
+#~ msgstr "Track Grade 5"
+
+#~ msgid "Footway"
+#~ msgstr "Footway"
+
 #~ msgid "Cycleway"
 #~ msgstr "Cycleway"
 
-#~ msgid "Footway"
-#~ msgstr "Footway"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Track Grade 1"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Modifica Track Grade 1"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Track Grade 2"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Modifica Track Grade 2"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Track Grade 3"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Modifica Track Grade 3"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Track Grade 4"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Modifica Track Grade 4"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Track Grade 5"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Modifica Track Grade 5"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Modifica percorso escursionistico"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "Percorso escursionistico montano"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Modifica percorso escursionistico montano"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Modifica percorso escursionistico montano difficile"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Modifica percorso escursionistico alpino"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Modifica percorso escursionistico alpino difficile"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Modifica un percorso escursionistico alpino molto difficile"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "Era richiesto un Id > 0, ottenuto {0}"
-
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "il parametro ''{0}'' non deve essere nullo"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "il parametro ''{0}'' non deve essere nullo"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "attesa istanza di OsmDataLayer o GpxLayer. Ricevuto \"{0}\"."
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "L'estensione richiede l'aggiornamento di JOSM: {0}."
+
+#~ msgid "Preparing..."
+#~ msgstr "Preparazione in corso..."
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Trasferimento annullato a causa dell'errore (attesa di 5 secondi):"
+
+#~ msgid "Uploading..."
+#~ msgstr "Invio in corso..."
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(Si può modificare il numero di giorni dopo il quale appare questo "
+#~ "avvertimento<br>specificando l'opzione di configurazione 'pluginmanager."
+#~ "warntime'.)"
+
+#~ msgid "Edit Properties"
+#~ msgstr "Modifica proprietà"
+
+#~ msgid "Plugin already exists"
+#~ msgstr "Estensione già esistente"
+
+#~ msgid "Only two nodes allowed"
+#~ msgstr "Sono permessi solo due nodi"
+
+#~ msgid "Only one node selected"
+#~ msgstr "Solo un nodo selezionato"
+
+#~ msgid "Copy Default"
+#~ msgstr "Copia predefinito"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Selezionare la riga da copiare."
+
+#~ msgid "citymap"
+#~ msgstr "mappa cittadina"
+
+#~ msgid "hikingmap"
+#~ msgstr "mappa escursionistica"
+
+#~ msgid "map"
+#~ msgstr "mappa"
+
+#~ msgid "bicyclemap"
+#~ msgstr "mappa ciclistica"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
+
+#~ msgid "Drawbridge"
+#~ msgstr "Ponte levatoio"
+
+#~ msgid "Server does not support changesets"
+#~ msgstr "Il server non supporta i changeset (API < 0.6)"
+
+#~ msgid "GPS unit timezone (difference to photo)"
+#~ msgstr "Fuso orario del GPS (differenza rispetto alle foto)"
+
+#~ msgid "Please report a ticket at {0}"
+#~ msgstr "Si prega di segnalare il problema a {0}"
+
+#~ msgid "Be sure to include the following information:"
+#~ msgstr "Assicurarsi di includere le seguenti informazioni:"
+
+#~ msgid "Include your steps to get to the error (as detailed as possible)!"
+#~ msgstr ""
+#~ "Includi i passi necessari per riprodurre l'errore (il più "
+#~ "dettagliatamente possibile)!"
+
+#~ msgid "Some of the nodes are (almost) in the line"
+#~ msgstr "Alcuni nodi sono (quasi) in linea"
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr "Si vuole veramente impostare la segnalazione come \"completata\"?"
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Importa file TCX come tracciato GPS"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Importa file TCX..."
+
+#~ msgid "Open images with AgPifoJ..."
+#~ msgstr "Apri immagini con AgPifoJ..."
+
+#~ msgid ""
+#~ "Try updating to the newest version of JOSM and all plugins before "
+#~ "reporting a bug."
+#~ msgstr ""
+#~ "Prova ad aggiornare JOSM e tutte le sue estensioni all'ultima versione "
+#~ "prima di segnalare un problema."
+
+#~ msgid "NullPointerException, possibly some missing tags."
+#~ msgstr "NullPointerException, è possibile che manchino delle etichette."
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Trovato etichetta <member> su una non relazione."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Id del nodo malformato"
+
+#~ msgid ""
+#~ "<html>WARNING: The password is stored in plain text in the preferences "
+#~ "file.<br>The password is transfered in plain text to the server, encoded "
+#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
+#~ msgstr ""
+#~ "<html>ATTENZIONE: la password è memorizzata in chiaro nel file delle "
+#~ "preferenze.<br>La password è trasferita al server in chiaro, codificata "
+#~ "nell'URL<br><b>Non usare una password importante.</b></html>"
+
+#~ msgid ""
+#~ "The sources (URL or filename) of tagging preset definition files. See "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
+#~ msgstr ""
+#~ "Il sorgente (URL o filename) dei files delle etichette predefinite. Vedi "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets per un aiuto."
+
+#~ msgid "Could not read from URL: \"{0}\""
+#~ msgstr "Impossibile leggere \"{0}\""
 
 #~ msgid ""
@@ -30594,748 +31964,4 @@
 #~ "Alcuni nodi potrebbero essere cancellati accidentalmente.\n"
 #~ "Sei veramente sicuro di continuare ?"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Impossibile annullare il comando ''{0}'' perché il livello ''{1}'' non è "
-#~ "più presente"
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "Il parametro ''''{0}'''' non deve essere vuoto"
-
-#~ msgid "Expected array of length 4, got {0}"
-#~ msgstr "Era atteso un vettore di lunghezza 4, ottenuto {0}"
-
-#~ msgid "Exactly four doubles excpected in string, got {0}"
-#~ msgstr ""
-#~ "Erano attesi esattamente quattro numeri in doppia precisione nella "
-#~ "stringa, ottenuto {0}"
-
-#~ msgid "Illegal double value ''{0}''"
-#~ msgstr "Valore in doppia precisione ''''{0}'''' non valido"
-
-#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
-#~ msgstr "Era atteso un parametro ''''{0}'''' > 0.0, ottenuto {1}"
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "Era atteso ID >= 0. Ottenuto {0}."
-
-#~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
-#~ msgstr "Era atteso il parametro ''''{0}'''' >= 0, ottenuto {1}"
-
-#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-#~ msgstr ""
-#~ "Il parametro ''{0}'' non è un nome di tipo valido. Ottenuto ''{1}''."
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "Il parametro ''{0}'' non è una classe accettata. Ottenuto ''{1}''."
-
-#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
-#~ msgstr "Era atteso un parametro ''''{0}'''' > 0, ottenuto {1}"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr ""
-#~ "Era atteso che il valore del parametro ''{0}\" fosse nell''intervallo 0.."
-#~ "{1}. Ottenuto ''{2}''."
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "è richiesto il parametro {0} > 0. Ottenuto {1}."
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "parametro attualmente fuori scala: ottenuto {0}"
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "indice di colonna non atteso. Ottenuto {0}"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "Il parametro 'col' deve essere 0 o 1. Ottenuto {0}"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "il parametro ''{0}'' non deve essere vuoto."
-
-#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
-#~ msgstr ""
-#~ "Era atteso il parametro ''''{0}'''' con etichette per una sola chiave. "
-#~ "Ottenuto {1}."
-
-#~ msgid "Dialog not created yet. Invoke createInstance() first"
-#~ msgstr "Finestra non ancora creata. Invocare prima createInstance()"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Open"
-#~ msgstr "Apri"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Closed"
-#~ msgstr "Chiuso"
-
-#~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
-#~ msgstr ""
-#~ "Era atteso un valore intero > 0 per il parametro ''''{0}'''', ottenuto "
-#~ "''''{1}''''"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Conflitto nei dati"
-
-#~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
-#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
-#~ "the new role?</html>"
-#~ msgstr ""
-#~ "<html>Si sta impostando un ruolo vuoto su {0} primitive.<br>Questo è "
-#~ "equivalente all'eliminazione dei ruoli di queste primitive.<br>Si "
-#~ "desidera veramente applicare il nuovo ruolo?</html>"
-
-#~ msgid "Value of child.getId() > 0 expected. Got {1}."
-#~ msgstr "Era atteso un valore child.getId() > 0. Ottenuto {1}."
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
-#~ msgstr "Atteso parametro ''{0}'' > 0. Valore attuale {1}."
-
-#~ msgid "id in parameter ''{0}'' > 0 expected, got {1}."
-#~ msgstr "atteso id nel parametro ''{0}'' > 0, valore attuale {1}."
-
-#~ msgid "Object id > 0 expected. Got {0}"
-#~ msgstr "Era atteso un oggetto con id > 0. Ottenuto {0}"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "immagine"
-#~ msgstr[1] "immagini"
-
-#~ msgid "Illegal value for attribute ''uid''. Got ''{0}''."
-#~ msgstr "Valore non valido per l''attributo ''''uid''''. Ottenuto ''{0}''."
-
-#~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-#~ msgstr "Era attesa una istanza di OsmDataLayer. Ottenuto ''{0}''."
-
-#~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "Era atteso un parametro ID ''''{0}'''' > 0. Ottenuto ''''{1}''''."
-
-#~ msgid "Expected value of type integer > 0 for parameter ''{0}'', got {1}"
-#~ msgstr ""
-#~ "Era atteso un valore di tipo intero > 0 per il parametro ''''{0}'''', "
-#~ "ottenuto {1}"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-#~ msgstr "era atteso il parametro ''{0}'' >= 0, ottenuto ''{1}''"
-
-#~ msgid "Expected value > 0 for parameter ''{0}'', got {1}"
-#~ msgstr ""
-#~ "Era atteso un valore  > 0 per il parametro ''''{0}'''', ottenuto {1}"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr ""
-#~ "L''estensione {0} richiede l''aggiornamento alla versione {1} di JOSM."
-
-#~ msgid "<html>"
-#~ msgstr "<html>"
-
-#~ msgid "Expected unique id > 0 for primitive id, got {0}"
-#~ msgstr ""
-#~ "Era atteso un identificativo unico > 0 per la primitiva, ottenuto {0}"
-
-#~ msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}"
-#~ msgstr ""
-#~ "Era atteso un valore di tipo intero lungo > 0 per il parametro "
-#~ "''''{0}'''', ottenuto {1}"
-
-#~ msgid "Parameter ''{0}'' of type node expected, got ''{1}''"
-#~ msgstr "Era atteso un parametro ''''{0}'''' di tipo nodo, ottenuto ''{1}''"
-
-#~ msgid "No data imported."
-#~ msgstr "Nessun dato importato."
-
-#~ msgid "Load Selection"
-#~ msgstr "Carica selezione"
-
-#~ msgid "Refresh the selection list."
-#~ msgstr "Ricarica la lista di selezione"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Selezionare almeno un compito per scaricare"
-
-#~ msgid "Data Layer"
-#~ msgstr "Livello dati"
-
-#~ msgid "Email"
-#~ msgstr "Email"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr ""
-#~ "È possibile modificare solo le pagine di aiuto dell'Aiuto in linea di JOSM"
-
-#~ msgid "Move"
-#~ msgstr "Sposta"
-
-#~ msgid "unnamed"
-#~ msgstr "Senza nome"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Nessun documento è aperto per cui non c'è niente da salvare."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "L'estensione del file è sconosciuta."
-
-#~ msgid "Change"
-#~ msgstr "Cambia"
-
-#~ msgid "Resolve {0} conflicts in {1} objects"
-#~ msgstr "Risolvere {0} conflitti in {1} oggetti"
-
-#~ msgid "Rotate"
-#~ msgstr "Ruota"
-
-#~ msgid "different"
-#~ msgstr "diverso"
-
-#~ msgid "true"
-#~ msgstr "vero"
-
-#~ msgid "false"
-#~ msgstr "falso"
-
-#~ msgid "position"
-#~ msgstr "posizione"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} oggetto causa conflitti:"
-#~ msgstr[1] "{0} oggetti causano conflitti:"
-
-#~ msgid "my version:"
-#~ msgstr "versione locale:"
-
-#~ msgid "their version:"
-#~ msgstr "versione remota:"
-
-#~ msgid "resolved version:"
-#~ msgstr "versione risolta:"
-
-#~ msgid "Resolve Conflicts"
-#~ msgstr "Resolvi conflitti"
-
-#~ msgid "Click Reload to refresh list"
-#~ msgstr "Fare clic su Ricarica per aggiornare la lista"
-
-#~ msgid "Object"
-#~ msgstr "Oggetto"
-
-#~ msgid "Date"
-#~ msgstr "Data"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Riporta lo stato di tutti gli oggetti correntemente selezionati alla "
-#~ "versione selezionata nella lista della cronologia."
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Cancella il livello selezionato."
-
-#~ msgid "Occupied By"
-#~ msgstr "Occupato da"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Etichette (un valore vuoto cancella l'etichetta)"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Aggiungi tutti gli oggetti selezionati come membri"
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Si sono verificati dei conflitti durante l'importazione."
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Errore di scansione nella risposta del server."
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Impossibile connettersi al server."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Per prima cosa, scegli un segnalibro."
-
-#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
-#~ msgstr ""
-#~ "Per spostare, ingrandire e rimpicciolire la mappa puoi usare il mouse "
-#~ "oppure premere Ctrl e le frecce, il punto (.) e la virgola (,)."
-
-#~ msgid "Images for {0}"
-#~ msgstr "Immagini per {0}"
-
-#~ msgid "Read GPX..."
-#~ msgstr "Leggi GPX..."
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Informazioni di tempo non disponibili per il punto {0} x {1}"
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Impossibile leggere il tempo \"{0}\" per il punto {1} x {2}"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Non è stata trovata nessuna immagine con una data leggibile."
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "GPS inizio: {0}"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "GPS fine: {0}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "differenza attuale: {0}s"
-
-#~ msgid "timezone difference: "
-#~ msgstr "differenza fuso orario: "
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} in questa traccia."
-
-#~ msgid "Sync clock"
-#~ msgstr "Sincronizza tempo"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "Impossibile leggere la data nel file \"{0}\"."
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "Orario non presente nei dati EXIF del file \"{0}\"."
-
-#~ msgid "Image"
-#~ msgstr "Immagine"
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Inserisci la data visualizzata (mm/gg/aaaa HH:MM:SS)"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Impossibile decodificare l'orario inserito."
-
-#~ msgid "name"
-#~ msgstr "nome"
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Apri il file (come gps grezzo se .gpx)"
-
-#~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
-#~ msgstr ""
-#~ "I parametri sono letti nell'ordine in cui sono specificati,\n"
-#~ "quindi assicurati di caricare dei dati prima di indicare una selezione."
-
-#~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
-#~ msgstr "Invece di --download=<zona> puoi utilizzare osm://<zona>\n"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Connessione al server OSM..."
-
-#~ msgid "Error while parsing"
-#~ msgstr "Impossibile interpretare"
-
-#~ msgid "File not found"
-#~ msgstr "File non trovato"
-
-#~ msgid "Update"
-#~ msgstr "Aggiorna"
-
-#~ msgid "Add either site-josm.xml or Wiki Pages."
-#~ msgstr "Aggiungi sia site-josm.xml che le pagine Wiki."
-
-#~ msgid "The base URL for the OSM server (REST API)"
-#~ msgstr "L'URL di base per il server OSM (API REST)"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Nome utente (email) per l'account di OSM."
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr ""
-#~ "Password per l'account di OSM. Lasciare vuoto per non memorizzare la "
-#~ "password."
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Nome utente o password errati."
-
-#~ msgid "Enter Password"
-#~ msgstr "Inserire la password"
-
-#~ msgid "Error during parse."
-#~ msgstr "Errore nella scansione."
-
-#~ msgid "Unknown version"
-#~ msgstr "Versione sconosciuta"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Trovato <nd> elemento in non-percorso."
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> ha zero ref"
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "Suggerimento: alcuni cambiamenti derivano dal caricamento dei nuovi dati "
-#~ "sul server."
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Impossibile scaricare il plugin: {0} da {1}"
-
-#~ msgid "Do not show again"
-#~ msgstr "Non mostrare di nuovo"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Impossibile leggere dal server i risultati della ricerca del luogo"
-
-#~ msgid "Navigation"
-#~ msgstr "Navigazione"
-
-#~ msgid "osmarender options"
-#~ msgstr "Opzioni osmarender"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Unire i nodi con diffenti appartenenze?"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Errore durante il caricamento della pagina {0}"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Apri nel Browser"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "Guida in linea di JOSM"
-
-#~ msgid ""
-#~ "Internal Error: cannot check conditions for no layer. Please report this "
-#~ "as a bug."
-#~ msgstr ""
-#~ "Errore Interno: impossibile controllare le condizioni dei layer. Segnala "
-#~ "questo come bug."
-
-#~ msgid "Revert"
-#~ msgstr "Ripristina"
-
-#~ msgid "Set the language."
-#~ msgstr "Imposta la lingua."
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Conflitto tra relazioni"
-
-#~ msgid "Split way segment"
-#~ msgstr "Dividi il segmento del percorso"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Unisci i conflitti."
-
-#~ msgid "Proxy server host"
-#~ msgstr "Host del server proxy"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anonimo"
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Abilita il server proxy"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Porta del server poxy"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Password del server proxy"
-
-#~ msgid ""
-#~ "Server returned internal error. Try a reduced area or retry after waiting "
-#~ "some time."
-#~ msgstr ""
-#~ "Il server ha restituito un errore interno. Prova con un'area piccola o "
-#~ "aspetta prima di riprovare."
-
-#~ msgid "Images with no exif position"
-#~ msgstr "Immagini senza posizione exif"
-
-#~ msgid "All images"
-#~ msgstr "Tutte le immagini"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "AgPifoJ - Geotagged pictures"
-#~ msgstr "AgPifoJ - fotografie con geotag"
-
-#~ msgid "Adjust the position of the WMS layer"
-#~ msgstr "Aggiusta la posizione dl layer WMS"
-
-#~ msgid "help"
-#~ msgstr "aiuto"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "I nodi selezionati appartengono a relazioni differenti. Vuoi comunque "
-#~ "unirli?"
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "Era attesa una parentesi chiusa."
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Tutti i percorsi erano vuoti"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (correzione GNOME)"
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "Metacarta Map Rectifier image id"
-#~ msgstr "Id dell'immagine Metacarta Map Rectifier"
-
-#~ msgid "Not yet tagged images"
-#~ msgstr "Immagini ancora senza etichetta"
-
-#~ msgid ""
-#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-#~ msgstr ""
-#~ "<html>Posso fare una fotografia al mio ricevitore GPS.<br>Può questo "
-#~ "essere di aiuto?</html>"
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "Tracciato GPS caricato"
-
-#~ msgid "Station"
-#~ msgstr "Stazione"
-
-#~ msgid "Shop"
-#~ msgstr "Negozio"
-
-#~ msgid "Edit Station"
-#~ msgstr "Modifica stazione"
-
-#~ msgid "Help / About"
-#~ msgstr "Aiuto / Informazioni su"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Convalida la selezione corrente oppure tutto l'insieme dei dati."
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Usa la preimpostazione ''{0}''"
-
-#~ msgid "Combine ways with different memberships?"
-#~ msgstr "Unire i percorsi con diverse appartenenze?"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "I percorsi selezionati appartengono a relazioni differenti. Vuoi comunque "
-#~ "unirli?"
-
-#~ msgid "Charge"
-#~ msgstr "Costo"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Inserire la stringa da cercare"
-
-#~ msgid "error requesting update"
-#~ msgstr "errore nella richiesta di aggiornamento"
-
-#~ msgid "requested: {0}"
-#~ msgstr "richiesta: {0}"
-
-#~ msgid "error loading metadata"
-#~ msgstr "errore nel caricamento dei metadati"
-
-#~ msgid "rectifier id={0}"
-#~ msgstr "identificativo rectifier={0}"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Usa la preimpostazione \"{0}\" del gruppo \"{1}\""
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Sorgenti preimpostazioni etichette"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Sorgente preimpostazioni etichette"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr ""
-#~ "Aggiunge una nuova sorgente di preimpostazioni di etichette alla lista."
-
-#~ msgid "Show Tile Status"
-#~ msgstr "Mostra lo stato dei tasselli"
-
-#~ msgid "Downloading..."
-#~ msgstr "Scaricamento in corso..."
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "L'attivazione delle estensioni aggiornate è fallita. Controllare se JOSM "
-#~ "ha i permessi per sovrascrivere quelle esistenti."
-
-#~ msgid "Downloaded plugin information from {0} site"
-#~ msgid_plural "Downloaded plugin information from {0} sites"
-#~ msgstr[0] "Informazioni sulle estensioni scaricate da {0} sito"
-#~ msgstr[1] "Informazioni sulle estensioni scaricate da {0} siti"
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Tutte le estensioni sono state aggiornate."
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Ci sono stati dei problemi con le seguenti estensioni:\n"
-#~ "\n"
-#~ "{0}"
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Estensione non trovata: {0}."
-
-#~ msgid "Update Plugins"
-#~ msgstr "Aggiorna estensioni"
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Scarica le estensioni mancanti"
-
-#~ msgid "WMS Plugin Help"
-#~ msgstr "Aiuto sull'estensione WMS"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "Impossibile rimuovere l'estensione. Riportate il problema alle persone da "
-#~ "cui si è ottenuto JOSM."
-
-#~ msgid "zoom"
-#~ msgstr "livello di ingrandimento"
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "L'estensione richiede l'aggiornamento di JOSM: {0}."
-
-#~ msgid "Preparing..."
-#~ msgstr "Preparazione in corso..."
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Trasferimento annullato a causa dell'errore (attesa di 5 secondi):"
-
-#~ msgid "Uploading..."
-#~ msgstr "Invio in corso..."
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(Si può modificare il numero di giorni dopo il quale appare questo "
-#~ "avvertimento<br>specificando l'opzione di configurazione 'pluginmanager."
-#~ "warntime'.)"
-
-#~ msgid "Edit Properties"
-#~ msgstr "Modifica proprietà"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Estensione già esistente"
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Sono permessi solo due nodi"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Solo un nodo selezionato"
-
-#~ msgid "Copy Default"
-#~ msgstr "Copia predefinito"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Selezionare la riga da copiare."
-
-#~ msgid "citymap"
-#~ msgstr "mappa cittadina"
-
-#~ msgid "hikingmap"
-#~ msgstr "mappa escursionistica"
-
-#~ msgid "map"
-#~ msgstr "mappa"
-
-#~ msgid "bicyclemap"
-#~ msgstr "mappa ciclistica"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid "Drawbridge"
-#~ msgstr "Ponte levatoio"
-
-#~ msgid "Server does not support changesets"
-#~ msgstr "Il server non supporta i changeset (API < 0.6)"
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "Fuso orario del GPS (differenza rispetto alle foto)"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Si prega di segnalare il problema a {0}"
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Assicurarsi di includere le seguenti informazioni:"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr ""
-#~ "Includi i passi necessari per riprodurre l'errore (il più "
-#~ "dettagliatamente possibile)!"
-
-#~ msgid "Some of the nodes are (almost) in the line"
-#~ msgstr "Alcuni nodi sono (quasi) in linea"
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr "Si vuole veramente impostare la segnalazione come \"completata\"?"
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Importa file TCX come tracciato GPS"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Importa file TCX..."
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Apri immagini con AgPifoJ..."
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr ""
-#~ "Prova ad aggiornare JOSM e tutte le sue estensioni all'ultima versione "
-#~ "prima di segnalare un problema."
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "NullPointerException, è possibile che manchino delle etichette."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Trovato etichetta <member> su una non relazione."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Id del nodo malformato"
-
-#~ msgid ""
-#~ "<html>WARNING: The password is stored in plain text in the preferences "
-#~ "file.<br>The password is transfered in plain text to the server, encoded "
-#~ "in the URL.<br><b>Do not use a valuable Password.</b></html>"
-#~ msgstr ""
-#~ "<html>ATTENZIONE: la password è memorizzata in chiaro nel file delle "
-#~ "preferenze.<br>La password è trasferita al server in chiaro, codificata "
-#~ "nell'URL<br><b>Non usare una password importante.</b></html>"
-
-#~ msgid ""
-#~ "The sources (URL or filename) of tagging preset definition files. See "
-#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
-#~ msgstr ""
-#~ "Il sorgente (URL o filename) dei files delle etichette predefinite. Vedi "
-#~ "http://josm.openstreetmap.de/wiki/TaggingPresets per un aiuto."
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Impossibile leggere \"{0}\""
 
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
@@ -31472,8 +32098,4 @@
 #~ msgstr "Spiacente, ma non funziona con gli utenti anonimi"
 
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr ""
-#~ "Selezionare dei percorsi con gli angoli da ortogonalizzare quasi giusti."
-
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Errore nell'interpretazione dei dati dell'indirizzo URL: \"{0}\""
@@ -31481,7 +32103,4 @@
 #~ msgid "Oberpfalz Geofabrik.de"
 #~ msgstr "Geofabrik.de dell'Alto Palatinato"
-
-#~ msgid "board"
-#~ msgstr "tavola"
 
 #~ msgid "Authors: {0}"
@@ -31535,7 +32154,4 @@
 #~ "Se selezionato rende pubblico il proprio tracciato in openstreetmap.org"
 
-#~ msgid "Public"
-#~ msgstr "Pubblico"
-
 #~ msgid "Open a layer first (GPX, OSM, cache)"
 #~ msgstr "Aprire prima un livello (GPX, OSM, cache)"
@@ -31652,4 +32268,25 @@
 #~ msgstr "Differenza tra il tracciato e le foto: {0}m {1}s"
 
+#~ msgid "Edit Track of grade 1"
+#~ msgstr "Modifica Track Grade 1"
+
+#~ msgid "Edit Track of grade 2"
+#~ msgstr "Modifica Track Grade 2"
+
+#~ msgid "Edit Track of grade 3"
+#~ msgstr "Modifica Track Grade 3"
+
+#~ msgid "Edit Track of grade 4"
+#~ msgstr "Modifica Track Grade 4"
+
+#~ msgid "Edit Track of grade 5"
+#~ msgstr "Modifica Track Grade 5"
+
+#~ msgid "Edit Demanding Alpine Hiking"
+#~ msgstr "Modifica percorso escursionistico alpino difficile"
+
+#~ msgid "Edit Difficult Alpine Hiking"
+#~ msgstr "Modifica un percorso escursionistico alpino molto difficile"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Modifica ponte levatoio"
@@ -31680,7 +32317,4 @@
 #~ msgid "sports"
 #~ msgstr "Articoli sportivi"
-
-#~ msgid "Interpolation"
-#~ msgstr "Interpolazione"
 
 #~ msgid "Optional"
@@ -31785,4 +32419,7 @@
 #~ msgstr "Risolvi conflitti nella lista dei membri della relazione {0}"
 
+#~ msgid ">"
+#~ msgstr ">"
+
 #~ msgid "Apply partial resolutions"
 #~ msgstr "Applica risoluzioni parziali"
@@ -31801,4 +32438,8 @@
 #~ msgid "Select a starting node on the end of a way"
 #~ msgstr "Selezionare un nodo iniziale alla fine di un percorso"
+
+#~ msgid "Plugin {0} requires JOSM update to version {1}."
+#~ msgstr ""
+#~ "L''estensione {0} richiede l''aggiornamento alla versione {1} di JOSM."
 
 #~ msgid ""
@@ -31979,4 +32620,7 @@
 #~ msgstr "errore nella richiesta di aggiornamento: non a zoom-level 12"
 
+#~ msgid "Conflicts in data"
+#~ msgstr "Conflitto nei dati"
+
 #~ msgid "Download referrers from OSM..."
 #~ msgstr "Scarica riferimenti da OSM..."
@@ -31995,4 +32639,9 @@
 #~ msgstr ""
 #~ "L''estensione con nome {0} non è disponibile. Aggiornamento ignorato."
+
+#~ msgid "The plugin could not be removed. Probably it was already disabled"
+#~ msgstr ""
+#~ "L''estensione non può essere rimossa. Probabilmente è stata già "
+#~ "disabilitata"
 
 #~ msgid ""
@@ -32053,7 +32702,16 @@
 #~ "<A HREF=\"{1}\">la propria lingua</A>."
 
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "il parametro ''{0}'' non deve essere nullo"
+
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr "attesa istanza di OsmDataLayer o GpxLayer. Ricevuto \"{0}\"."
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "Valore di ritorno inatteso. Ottenuto {0}"
 
+#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "è richiesto il parametro {0} > 0. Ottenuto {1}."
+
 #~ msgid "There's no primitive with version {0} in this history."
 #~ msgstr "non c'è alcuna primitiva con versione {0} in questo storico"
@@ -32064,4 +32722,13 @@
 #~ msgid "No latest version found. History is empty."
 #~ msgstr "non è stata trovata la versione più recente. Lo storico è vuoto."
+
+#~ msgid "Parameter current out of range. Got {0}."
+#~ msgstr "parametro attualmente fuori scala: ottenuto {0}"
+
+#~ msgid "Unexpected column index. Got {0}."
+#~ msgstr "indice di colonna non atteso. Ottenuto {0}"
+
+#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
+#~ msgstr "Il parametro 'col' deve essere 0 o 1. Ottenuto {0}"
 
 #~ msgid "Index out of bounds. Got {0}."
@@ -32087,8 +32754,14 @@
 #~ "ricevuto ''{1}''"
 
+#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
+#~ msgstr "era atteso il parametro ''{0}'' >= 0, ottenuto ''{1}''"
+
 #~ msgid "Replace the way this member refers to with the combined way"
 #~ msgstr ""
 #~ "Sostituisci il percorso a cui fa riferimento questo membro con il "
 #~ "percorso unito"
+
+#~ msgid "Expected ID >= 0. Got {0}."
+#~ msgstr "Era atteso ID >= 0. Ottenuto {0}."
 
 #~ msgid ""
@@ -32130,6 +32803,30 @@
 #~ msgstr "Impossibile effettuare la ricerca perché non ci sono dati caricati."
 
+#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
+#~ msgstr ""
+#~ "Era atteso che il valore del parametro ''{0}\" fosse nell''intervallo 0.."
+#~ "{1}. Ottenuto ''{2}''."
+
+#~ msgid "Parameter ''{0}'' must not be empty."
+#~ msgstr "il parametro ''{0}'' non deve essere vuoto."
+
 #~ msgid "No earliest version found. History is empty."
 #~ msgstr "Non è stata trovata alcuna versione precedente. Lo storico è vuoto."
+
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "il parametro ''{0}'' non deve essere nullo"
+
+#~ msgid ""
+#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
+#~ msgstr ""
+#~ "Impossibile annullare il comando ''{0}'' perché il livello ''{1}'' non è "
+#~ "più presente"
+
+#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
+#~ msgstr ""
+#~ "Il parametro ''{0}'' non è un nome di tipo valido. Ottenuto ''{1}''."
+
+#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
+#~ msgstr "Il parametro ''{0}'' non è una classe accettata. Ottenuto ''{1}''."
 
 #~ msgid "No type found. History is empty."
@@ -32162,4 +32859,7 @@
 #~ msgstr "Percorso intermedio: {0}"
 
+#~ msgid "Dialog not created yet. Invoke createInstance() first"
+#~ msgstr "Finestra non ancora creata. Invocare prima createInstance()"
+
 #~ msgid "Use an open changeset"
 #~ msgstr "Utilizza un insieme di modifiche aperto"
@@ -32169,4 +32869,7 @@
 #~ "Errore: fallita l'aggiunta delle credenziali di autenticazione alla "
 #~ "connessione."
+
+#~ msgid "<html>"
+#~ msgstr "<html>"
 
 #~ msgid ""
@@ -32203,4 +32906,13 @@
 #~ "caricamento differenziale."
 
+#~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "Era atteso un parametro ID ''''{0}'''' > 0. Ottenuto ''''{1}''''."
+
+#~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+#~ msgstr "Era attesa una istanza di OsmDataLayer. Ottenuto ''{0}''."
+
+#~ msgid "Illegal value for attribute ''uid''. Got ''{0}''."
+#~ msgstr "Valore non valido per l''attributo ''''uid''''. Ottenuto ''{0}''."
+
 #~ msgid "Current changeset is null. Can't upload data."
 #~ msgstr ""
@@ -32209,4 +32921,16 @@
 #~ msgid "Preset group ''{0}'' of group ''{1}''"
 #~ msgstr "Gruppo di preimpostati ''''{0}'''' del gruppo ''''{1}''''"
+
+#~ msgid "Value of child.getId() > 0 expected. Got {1}."
+#~ msgstr "Era atteso un valore child.getId() > 0. Ottenuto {1}."
+
+#~ msgid ""
+#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
+#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
+#~ "the new role?</html>"
+#~ msgstr ""
+#~ "<html>Si sta impostando un ruolo vuoto su {0} primitive.<br>Questo è "
+#~ "equivalente all'eliminazione dei ruoli di queste primitive.<br>Si "
+#~ "desidera veramente applicare il nuovo ruolo?</html>"
 
 #~ msgid ""
@@ -32217,4 +32941,9 @@
 #~ "manca la codifica ''''{0}''''.</html>"
 
+#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
+#~ msgstr ""
+#~ "Era atteso il parametro ''''{0}'''' con etichette per una sola chiave. "
+#~ "Ottenuto {1}."
+
 #~ msgid "Failed to read command. Exiting help browser. Exception was:"
 #~ msgstr ""
@@ -32224,4 +32953,7 @@
 #~ msgid "Failed to launch the external help browser"
 #~ msgstr "Fallita l'apertura del browser esterno di aiuto"
+
+#~ msgid "Object id > 0 expected. Got {0}"
+#~ msgstr "Era atteso un oggetto con id > 0. Ottenuto {0}"
 
 #~ msgid ""
@@ -32235,4 +32967,7 @@
 #~ msgid "Proxy server username"
 #~ msgstr "Username del server proxy"
+
+#~ msgid "Id > 0 required, got {0}"
+#~ msgstr "Era richiesto un Id > 0, ottenuto {0}"
 
 #~ msgid "Set manually the Lambert zone"
@@ -32250,6 +32985,20 @@
 #~ "manualmente la zona di Lambert dal menu Cadastre"
 
+#~ msgid "Expected array of length 4, got {0}"
+#~ msgstr "Era atteso un vettore di lunghezza 4, ottenuto {0}"
+
+#~ msgid "Parameter ''{0}'' must not be empty"
+#~ msgstr "Il parametro ''''{0}'''' non deve essere vuoto"
+
 #~ msgid "Failed to load load resource ''{0}''. Error is {1}"
 #~ msgstr "Fallito il caricamento della risorsa ''''{0}''''. L''errore è {1}"
+
+#~ msgid "Illegal double value ''{0}''"
+#~ msgstr "Valore in doppia precisione ''''{0}'''' non valido"
+
+#~ msgid "Exactly four doubles excpected in string, got {0}"
+#~ msgstr ""
+#~ "Erano attesi esattamente quattro numeri in doppia precisione nella "
+#~ "stringa, ottenuto {0}"
 
 #~ msgid "{0} Plugin successfully downloaded."
@@ -32292,4 +33041,7 @@
 #~ "il posto del percorso originale nell'appartenenza.</html>"
 
+#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+#~ msgstr "Era atteso un parametro ''''{0}'''' > 0.0, ottenuto {1}"
+
 #~ msgid "User with the same uid but different name found"
 #~ msgstr ""
@@ -32297,4 +33049,29 @@
 #~ "differenti"
 
+#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
+#~ msgstr "Era atteso un parametro ''''{0}'''' > 0, ottenuto {1}"
+
+#~ msgctxt "changeset.open"
+#~ msgid "Closed"
+#~ msgstr "Chiuso"
+
+#~ msgctxt "changeset.open"
+#~ msgid "Open"
+#~ msgstr "Apri"
+
+#~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
+#~ msgstr "Era atteso il parametro ''''{0}'''' >= 0, ottenuto {1}"
+
+#~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
+#~ msgstr ""
+#~ "Era atteso un valore intero > 0 per il parametro ''''{0}'''', ottenuto "
+#~ "''''{1}''''"
+
+#~ msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+#~ msgstr "atteso id nel parametro ''{0}'' > 0, valore attuale {1}."
+
+#~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
+#~ msgstr "Atteso parametro ''{0}'' > 0. Valore attuale {1}."
+
 #~ msgid " (<a href=\"urn:changeset-configuration\">configure changeset</a>)"
 #~ msgstr ""
@@ -32308,4 +33085,11 @@
 #~ msgstr "Elimina il file della vecchia estensione {0}"
 
+#~ msgid "Expected value > 0 for parameter ''{0}'', got {1}"
+#~ msgstr ""
+#~ "Era atteso un valore  > 0 per il parametro ''''{0}'''', ottenuto {1}"
+
+#~ msgid "Parameter ''{0}'' of type node expected, got ''{1}''"
+#~ msgstr "Era atteso un parametro ''''{0}'''' di tipo nodo, ottenuto ''{1}''"
+
 #~ msgid "Checking locales..."
 #~ msgstr "Controllo delle localizzazioni..."
@@ -32313,2 +33097,16 @@
 #~ msgid "Loading available locales..."
 #~ msgstr "Caricamento delle localizzazioni disponibili..."
+
+#~ msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}"
+#~ msgstr ""
+#~ "Era atteso un valore di tipo intero lungo > 0 per il parametro "
+#~ "''''{0}'''', ottenuto {1}"
+
+#~ msgid "Expected unique id > 0 for primitive id, got {0}"
+#~ msgstr ""
+#~ "Era atteso un identificativo unico > 0 per la primitiva, ottenuto {0}"
+
+#~ msgid "Expected value of type integer > 0 for parameter ''{0}'', got {1}"
+#~ msgstr ""
+#~ "Era atteso un valore di tipo intero > 0 per il parametro ''''{0}'''', "
+#~ "ottenuto {1}"
Index: applications/editors/josm/i18n/po/ja.po
===================================================================
--- applications/editors/josm/i18n/po/ja.po	(revision 19689)
+++ applications/editors/josm/i18n/po/ja.po	(revision 19698)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 23:20-0500\n"
-"PO-Revision-Date: 2010-01-18 23:55-0500\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-28 06:18+0000\n"
 "Last-Translator: higa4 <higa432@gmail.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-01-13 18:26+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -70,11 +70,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -242,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -254,13 +254,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -269,5 +269,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -295,5 +298,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "マージ"
@@ -324,5 +327,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -389,9 +392,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -399,5 +402,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "OK"
@@ -448,6 +453,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -465,5 +470,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -472,11 +477,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -513,5 +518,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "競合"
@@ -643,14 +648,14 @@
 msgstr "結合するウェイを少なくとも二つ選択してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "コピー"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "選択したオブジェクトをペースト用バッファにコピーします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "コピーするものを選択してください。"
@@ -683,8 +688,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -693,5 +698,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -749,11 +754,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "インポートした内容には {0} の競合があります。"
+msgstr[0] "インポート中に {0} の競合がありました。"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
@@ -777,4 +781,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -784,4 +790,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "コピー後すぐに貼り付けで複製"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "ウェイの複製"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+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:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "レイヤー: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, 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 ""
 
 #. <button label="Info" hotkey="I">
@@ -872,9 +906,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 msgid "The selected way has nodes outside of the downloaded data region."
 msgid_plural ""
 "The selected ways have nodes outside of the downloaded data region."
-msgstr[0] "選択したウェイは選択したノードをつかって構成されていません。"
+msgstr[0] ""
+"選択したウェイにはダウンロードされたデータ領域の外にノードがあります。"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -886,5 +920,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:69
 msgid "Are you really sure to continue?"
-msgstr ""
+msgstr "本当に継続しますか？"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157
@@ -995,5 +1029,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "URL"
@@ -1146,5 +1180,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+#, fuzzy
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr ""
 "<html>ディレクトリをオープンできません。<br>ファイルを選択してください！"
@@ -1159,8 +1194,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "{0} ファイルを開いています..."
+msgstr[0] "{0} ファイルをオープン中"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1216,7 +1251,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1230,5 +1265,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "角度が９０度ないしは２７０度になるようにノードを移動します。"
 
@@ -1267,4 +1303,9 @@
 "て見てください。<br>続けますか?</html>"
 
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+#, fuzzy
+msgid "Selection must consist only of ways and nodes."
+msgstr "マルチポリゴンはクローズドウェイだけから構成されていなければなりません"
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
 msgid "Orthogonalize"
@@ -1279,4 +1320,15 @@
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "選択した要素はオルソ化できません"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr "ほぼ垂直になっているウェイを選択してください。"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1293,9 +1345,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151
 msgid "Delete incomplete members?"
-msgstr ""
+msgstr "不完全な数字を削除？"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152
 msgid "Paste without incomplete members"
-msgstr ""
+msgstr "不完全な数字なしで貼り付け"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
@@ -1381,18 +1433,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1417,12 +1469,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "エラー"
@@ -1556,5 +1609,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1754,8 +1807,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "{0}ノードを{1}ノードと見なす"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1799,5 +1853,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr "データのダウンロード"
@@ -2095,5 +2149,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:96
 msgid "Delete nodes or ways."
-msgstr "ノードまたはウェイを削除します"
+msgstr "ノードやウェイの削除"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:97
@@ -2225,6 +2279,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2306,7 +2360,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
-#, fuzzy
 msgid "<not>"
-msgstr "北"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
@@ -2319,7 +2372,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
-#, fuzzy
 msgid "<right parent>"
-msgstr "右括弧がありません"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
@@ -2349,7 +2401,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
-msgstr "オブジェクトを検索する。"
+msgstr "オブジェクトを検索"
 
 #. -- prepare the combo box with the search expressions
@@ -2393,9 +2445,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:118
 msgid "<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name."
-msgstr "<b>ベイカー ストリート</b> - 任意のキーや名前に ''ベイカー'' と ''ストリート'' を両方含むもの"
+msgstr ""
+"<b>ベイカー ストリート</b> - 任意のキーや名前に ''ベイカー'' と ''ストリー"
+"ト'' を両方含むもの"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
-msgstr "<b>\"ベイカー ストリート\"</b> - 任意のキーや名前に ''ベイカー ストリート'' を含むもの。"
+msgstr ""
+"<b>\"ベイカー ストリート\"</b> - 任意のキーや名前に ''ベイカー ストリート'' "
+"を含むもの。"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
@@ -2411,5 +2467,7 @@
 "<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>なども可能です。"
+msgstr ""
+"<b>type=*</b> -  ''type'' というキーを持つもの全て。* は任意の文字列を意味し"
+"ます。<b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>なども可能です。"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
@@ -2441,5 +2499,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
-msgstr "<b>ユーザ:匿名</b> - 匿名ユーザによって変更された全てのオブジェクト"
+msgstr "<b>user:anonymous</b> - 匿名ユーザによって変更された全てのオブジェクト"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
@@ -2452,6 +2510,6 @@
 "assigned version)"
 msgstr ""
-"<b>version:</b>... - 指定したバージョンを持つオブジェクト（バージョンを指定し"
-"ないと何も検索されません）"
+"<b>version:</b>... - 指定したバージョンを持つオブジェクト（バージョン番号のな"
+"いオブジェクトは0）"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
@@ -2460,6 +2518,6 @@
 "assigned changeset)"
 msgstr ""
-"<b>変更セット:</b>... - 与えられた変更セットIDのオブジェクト(割り当てられた変"
-"更セットの無いオブジェクトは0)"
+"<b>changeset:</b>... - 変更セットIDのオブジェクト（変更セットに含まれていない"
+"オブジェクトは0)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
@@ -2468,6 +2526,6 @@
 "min-max)"
 msgstr ""
-"<b>ノード:</b>... - 指定されたノード数のオブジェクト (nodes:count または "
-"nodes:min-max)"
+"<b>nodes:</b>... - 指定した数のノードをもつオブジェクト（nodes:数 または "
+"nodes:最小-最大で指定）"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
@@ -2484,10 +2542,10 @@
 "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> or <b>T14:51</b> ...)"
+"<b>timestamp:</b>... - 指定したタイムスタンプのオブジェクト (<b>2009-11-"
+"12T14:51:09Z</b>、<b>2009-11-12</b>　や <b>T14:51</b> 等)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "<b>modified</b> - all changed objects"
-msgstr "<b>変更済み</b> - 変更されたオブジェクトすべて"
+msgstr "<b>modified</b> - 変更されたオブジェクトすべて"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
@@ -2497,9 +2555,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:138
 msgid "<b>incomplete</b> - all incomplete objects"
-msgstr "<b>不完全</b> - すべての不完全なオブジェクト"
+msgstr "<b>incomplete</b>- すべての不完全なオブジェクト"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:139
 msgid "<b>untagged</b> - all untagged objects"
-msgstr "<b>タグなし</b> - すべてのタグなしオブジェクト"
+msgstr "<b>untagged</b> - タグの無いオブジェクト全て"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:140
@@ -2520,6 +2578,6 @@
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
-"演算子を引用する場合には<b>\"</b> を使ってください(例. キーが<b>:</b>を含む場"
-"合)"
+"文字列に引用符をつける場合は<b>\"</b> を使ってください（キーが<b>:</b>を含む"
+"場合など）"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:144
@@ -2528,6 +2586,6 @@
 "escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
 msgstr ""
-"引用文字列に<b>\"</b> 及び <b>\\</b> がある場合には、その前に<b>\\</b>文字を"
-"付けてエスケープしてください (例. <b>\\\"</b> 及び <b>\\\\</b>)。"
+"引用符で囲った文字列に <b>\"</b> か <b>\\</b> を含むときには、<b>\\</b> を加"
+"えてエスケープしてください。(<b>\\\"</b> 及び <b>\\\\</b>）。"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
@@ -2544,5 +2602,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "検索"
@@ -2569,10 +2627,10 @@
 #, java-format
 msgid "Nothing removed from selection by searching for ''{0}''"
-msgstr "''{0}''を検索することにより、何も選択肢から除かれませんでした。"
+msgstr "''{0}'' を検索しましたが、選択からは何も取り除いていません。"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:285
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
-msgstr "''{0}'' を探しましたがセレクションの中には見つかりませんでした"
+msgstr "選択の中に \"{0}\" と一致するものは見つかりませんでした。"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:295
@@ -2582,25 +2640,22 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "CS"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
-msgstr "CI"
+msgstr ""
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
-msgstr "RX"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2614,5 +2669,5 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2620,5 +2675,5 @@
 "ださい: key=value"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2642,7 +2697,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
-msgstr "予想外のトークン: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
@@ -2764,8 +2819,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "{0} オブジェクトを追加しました"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2815,12 +2871,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "Remove \"{0}\" for {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Set {0}={1} for {2} {3}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2885,17 +2941,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "削除モード"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "{0} のウェイを削除"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "{0} のリレーションを削除"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2945,17 +3001,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "Set the ''modified'' flag for node {0}"
-msgstr "ノード {0} 用に''変更された''フラグをセット"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Set the ''modified'' flag for way {0}"
-msgstr "ウェイ {0} 用に''変更された''フラグをセット"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ModifiedConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Set the ''modified'' flag for relation {0}"
-msgstr "リレーション {0} 用に''変更された''フラグをセット"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:121
@@ -2971,8 +3027,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "{0} 個のオブジェクトを取り除いた。"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -3021,23 +3078,24 @@
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "Undelete {0} primitive"
 msgid_plural "Undelete {0} primitives"
-msgstr[0] "{0} のプリミティブを復活"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for node {0}"
-msgstr "ノード {0} のバージョン競合を解決"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for way {0}"
-msgstr "ウェイ {0} のバージョン競合を解決"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "リレーション {0} のバージョン競合を解決"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3282,5 +3340,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:140
 msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr ""
+msgstr "警告: リビジョンファイル ''/REVISION'' がありません。"
 
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:76
@@ -3304,5 +3362,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3310,5 +3368,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3316,5 +3374,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3322,5 +3380,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3390,8 +3448,7 @@
 #. column header: hide filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
-#, fuzzy
 msgctxt "filter"
 msgid "H"
-msgstr "H"
+msgstr ""
 
 #. column header: filter text
@@ -3403,67 +3460,60 @@
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "C"
+msgstr ""
 
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
-#, fuzzy
 msgctxt "filter"
 msgid "I"
-msgstr "I"
+msgstr ""
 
 #. column header: filter mode
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
-#, fuzzy
 msgctxt "filter"
 msgid "M"
-msgstr "M"
+msgstr ""
 
 #. translators notes must be in front
 #. filter mode: replace
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210
-#, fuzzy
 msgctxt "filter"
 msgid "R"
-msgstr "R"
+msgstr ""
 
 #. filter mode: add
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211
-#, fuzzy
 msgctxt "filter"
 msgid "A"
-msgstr "A"
+msgstr ""
 
 #. filter mode: remove
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212
-#, fuzzy
 msgctxt "filter"
 msgid "D"
-msgstr "D"
+msgstr ""
 
 #. filter mode: in selection
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213
-#, fuzzy
 msgctxt "filter"
 msgid "F"
-msgstr "F"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "id=0 のプリミティブは非表示にできません"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "ID > 0 である必要があります。 {0} を受け取りました"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "バージョン > 0 である必要があります。 {0} を受け取りました"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3474,5 +3524,5 @@
 "は {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3480,5 +3530,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3604,6 +3654,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3612,5 +3662,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3620,7 +3670,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3641,5 +3691,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "背景"
@@ -3786,6 +3836,6 @@
 msgstr "次回から表示しない"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3793,37 +3843,38 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "不完全"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "道路"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "鉄道"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "水路"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "土地利用"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3831,10 +3882,10 @@
 msgstr[0] "{0}ノード"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr "公共輸送機関"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3842,5 +3893,5 @@
 msgstr[0] "{0} メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3877,6 +3928,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "競合"
@@ -3887,6 +3938,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-#| msgid "Authorisation Failed"
-msgid "Authorization Failed"
+msgid "Authorisation Failed"
 msgstr "認証失敗"
 
@@ -4094,5 +4144,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "初期化"
@@ -4133,5 +4182,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4142,5 +4191,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "編集"
@@ -4211,29 +4260,29 @@
 msgstr "拡大・縮小"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "マウスポインターで示される地理経度"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The name of the object at the mouse pointer."
 msgstr "マウスポインターで示されるオブジェクトの名前"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "マウスポインターで示される地理緯度"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The angle between the previous and the current way segment."
 msgstr "これより前のウェイセグメントとこのウェイセグメントの間の角度。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "描かれている線分の(コンパスの)向き"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 msgid "The length of the new way segment being drawn."
 msgstr "描きたい新規ウェイセグメントの長さ"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4243,9 +4292,9 @@
 "ウスでこの表から直接選べます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(オブジェクトなし)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4410,14 +4459,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "タグ({0} 競合)"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "{0} pending tag conflict to be resolved"
 msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "解決待ちの保留中タグ競合 {0}"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
@@ -4476,16 +4527,16 @@
 msgstr "競合の解決"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, 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:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "パラメータ \"index\" に予期せぬ値。入力値: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4689,7 +4740,12 @@
 msgstr "ノード"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr "結合したノードがまだ固定されていません。解決コマンドをビルドできません"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4715,5 +4771,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional node used by way {1}<br>which is deleted on the "
@@ -4723,6 +4779,5 @@
 "server.<br><br>Do you want to undelete these nodes too?"
 msgstr[0] ""
-"<html>サーバーから削除されたウェイ{1}に<br>付加された {0} 個のノードがありま"
-"す。<br><br>これらのノードも復活させたいですか?</html>"
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
@@ -4731,5 +4786,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional primitive referred to by relation {1}<br>which is "
@@ -4739,6 +4794,5 @@
 "deleted on the server.<br><br>Do you want to undelete these too?"
 msgstr[0] ""
-"<html>サーバーから削除されたリレーション{1}に<br>参照されていた {0} 個のプリ"
-"ミティブがあります。<br><br>これらも復活させたいですか?</html>"
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
@@ -4841,5 +4895,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr "いいえ、異常終了します"
@@ -4890,5 +4944,10 @@
 msgstr "プリミティブ"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr "結合したノードはまだ固定されていません。解決コマンドをビルドできません"
@@ -5018,10 +5077,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "なし"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "全て"
@@ -5100,7 +5159,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -5109,6 +5168,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5294,10 +5353,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5317,18 +5376,18 @@
 msgstr "指示の集積: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr "競合を解決"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "解決"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr "上記リストの全てのアイテムを結合するダイアログを開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5360,8 +5419,9 @@
 msgid ""
 "<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions won't be applied unless all differences<br>are "
-"resolved.Click <strong>{0}</strong> to close anyway."
-"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<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 ""
 
@@ -5384,5 +5444,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5391,5 +5451,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5443,5 +5503,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:68
 msgid "Display the history of all selected items."
-msgstr "選択したアイテムすべての履歴の表示"
+msgstr "選択したアイテムすべての履歴"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:254
@@ -5469,43 +5529,48 @@
 msgstr "選択したオブジェクトの履歴を表示。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "レイヤー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 msgid "Open a list of all loaded layers."
-msgstr "全ての読み込んだレイヤーのリストを開きます"
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:267
+msgstr "レイヤーの一覧"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr "選択したレイヤーを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "表示/非表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr "有効化"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr "選択されたレイヤーを有効化"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr "このレイヤーを他のレイヤーに結合"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "ウェイの複製"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 msgid "Move the selected layer one row up."
 msgstr "選択したレイヤーを一つ上に上げます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "選択したレイヤーを一つ下に移動します。"
@@ -5519,6 +5584,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "リレーション"
@@ -5528,69 +5593,69 @@
 msgstr "全てのリレーションのリストを開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "リレーション: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "選択したリレーションの編集画面を開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "選択したリレーションを削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "新規リレーション作成"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "このリレーションのコピーを作成し、他の編集ウィンドウで開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr "現在の選択を選択したリレーションのリストへセットする"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr "全ての選択済リレーションのメンバーを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr "メンバーを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr "選択済リレーションの全メンバーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr "メンバーをダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "現在の選択範囲"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "セレクションリスト　ウインドウを開きます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "選択した要素にズーム"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "セレクションへズーム"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "選択: 関連:{0}/ウェイ:{1}/ノード:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5598,5 +5663,5 @@
 msgstr "選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5864,5 +5929,6 @@
 "<html>None of the selected objects is available in the current<br>edit layer "
 "''{0}''.</html>"
-msgstr "<html>選択したオブジェクトは現在の編集レイヤー  ''{0}'' 上にありません。</html>"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331
@@ -5952,8 +6018,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -6025,4 +6089,7 @@
 #. <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 />
@@ -6101,6 +6168,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6142,6 +6210,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6610,152 +6680,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "名前"
@@ -6918,8 +6990,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:536
-#, fuzzy, java-format
+#, java-format
 msgid "Cannot restrict the changeset query to the user name ''{0}''"
 msgstr ""
-"現在匿名ユーザーで編集しているため、変更セットのクエリを制限できません。"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
@@ -6982,9 +7053,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
-#, fuzzy
 msgid ""
 "Cannot restrict the changeset query to a specific bounding box. The input is "
 "invalid."
-msgstr "指定した境界囲みに関連する変更セットだけを選択"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
@@ -7146,5 +7216,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<差異あり>"
@@ -7197,55 +7267,55 @@
 msgstr "プロパティの追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "プロパティ: {0} / メンバー: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "プロパティ/メンバー"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "関連の変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "関連から削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "本当に関連{0}から選択分を削除しますか？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "すべてのオブジェクトの選択したキーの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "プロパティの削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "すべてのオブジェクトに新しいキー/値をペアで追加"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "すべてのオブジェクトの選択したキーの値の編集"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr "リレーションを選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr "メインの選択肢から条件を選んでください"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr "リレーション一覧のリレーションを選択。"
@@ -7281,8 +7351,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1093
-#, fuzzy
 msgid "Conflict in data"
 msgid_plural "Conflicts in data"
-msgstr[0] "データ中に競合"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:345
@@ -7585,4 +7655,5 @@
 msgid_plural "You are setting an empty role on {0} primitives."
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
@@ -7591,7 +7662,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
-#, fuzzy
 msgid "Do you really want to apply the new role?"
-msgstr "本当にこれを許可してよろしいですか？"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
@@ -7686,8 +7756,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr "警告: タスクがキャンセルされたので例外を無視。例外: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
@@ -7707,30 +7777,30 @@
 msgstr "ウェイは前や後のリレーションメンバーに接続されていません"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "ブックマーク"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../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:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+#, fuzzy
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
 msgstr ""
 "<html><strong>現在のダウンロードエリア</strong> (最小緯度, 最小経度, 最大緯"
 "度, 最大経度): {0}, {1}, {2}, {3}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr "ブックマークを作成"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:192
 msgid ""
 "Currently, there is no download area selected. Please select an area first."
@@ -7739,19 +7809,19 @@
 "い。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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:212
+#: ../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:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr "現在選択中のブックマークをリネーム"
@@ -7876,18 +7946,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr "境界"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr "近く"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -7898,34 +7968,34 @@
 msgstr "検索サーバを選択:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../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:111
+#: ../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:147
+#: ../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:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "ヌルポインタ例外です。失われたタグがあるのでしょう。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr "検索 ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr "クリックして場所を検索"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr "ネームサーバに問合せ中"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr "ネームサーバに問合せ中 ..."
@@ -7936,7 +8006,9 @@
 #. 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" />
@@ -7945,10 +8017,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "タイプ"
@@ -7957,5 +8030,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -7967,17 +8040,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "不明な"
@@ -8102,7 +8174,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511
-#, fuzzy, java-format
+#, java-format
 msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr "警告: HTMLドキュメント中に不正な位置。例外コード: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561
@@ -8297,11 +8369,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65
-#, fuzzy, java-format
+#, 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
@@ -8347,5 +8417,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr "競合が検出されました"
@@ -8535,11 +8605,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Authenticating at the OSM API ''{0}'' failed. Please enter a valid username "
 "and a valid password."
 msgstr ""
-"<html>OSM APIの認証 ''{0}'' に失敗しました。正しいユーザ名とパスワードを入力"
-"してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242
@@ -8556,20 +8624,15 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid "
 "username and a valid password."
 msgstr ""
-"<html>HTTPプロキシ ''{0}'' の認証に失敗しました。有効なユーザー名とパスワード"
-"を入力してください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259
-#, fuzzy
 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
@@ -8724,5 +8787,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>{0} layer needs saving but has an associated file<br>which cannot be "
@@ -8734,7 +8797,5 @@
 "changes.<br>Layers with non-writable files:</html>"
 msgstr[0] ""
-"<html>{0} レイヤーは保存が必要ですが<br>書き込み不可の<br>関連するファイルが"
-"あります。<br>このレイヤー用の他のファイルを選択するか変更を破棄してくださ"
-"い。<br>書き込み不可のファイルのあるレイヤー:</html>"
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
@@ -8784,5 +8845,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -8792,6 +8853,5 @@
 "cancelled or have failed.</html>"
 msgstr[0] ""
-"<html>変更したレイヤのアップロードまたは保存の作業は<br>キャンセルされたか失"
-"敗しました。</html>"
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500
@@ -8814,9 +8874,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8826,7 +8886,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -8838,16 +8898,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "レイヤー"
@@ -9272,68 +9332,68 @@
 msgstr[0] "削除するオブジェクトの個数: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "GPSポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "線描画のカスタマイズ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Use global settings."
 msgstr "全体設定を使用"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "配色のカスタマイズ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "既定"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "色選択"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr "名前のついた地点からのマーカー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "{0} からの名前付きトラックポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "音声のインポート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9345,23 +9405,23 @@
 "タイムスタンプの情報が無いため、音声データとの同期はできません。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "WAV音声ファイル(*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "{0} からの音声マーカー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "イメージのインポート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9373,5 +9433,5 @@
 "タイムスタンプの情報が無いため、写真との同期はできません。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9379,5 +9439,5 @@
 msgstr "名前: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9385,5 +9445,5 @@
 msgstr "記述: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9392,23 +9452,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "説明"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr "時間間隔"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr "長さ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "長さ: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9416,5 +9476,5 @@
 msgstr[0] "{0}ルート, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9422,10 +9482,10 @@
 msgstr[0] "{0} ウェイポイント"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "データレイヤーへ変換"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9436,43 +9496,43 @@
 "てください："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "{0}からのコンバート"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "このトラックに沿ってOSMからダウンロード"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "次の範囲内の全てをダウンロード:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} メータ"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "リクエストあたりの最大面積："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} 平方キロメートル"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9483,9 +9543,9 @@
 "すか？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 msgid "No GPX track available in layer to associate audio with."
 msgstr "音声に関連づいたGPXトラックがこのレイヤーにありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9495,5 +9555,5 @@
 "に変更又は移動されました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9503,23 +9563,23 @@
 "外します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "データレイヤー {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "ダウンロード領域の外"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr "バージョン {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 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:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9527,5 +9587,5 @@
 msgstr[0] "検出された競合が {0} 個あります"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9539,5 +9599,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9550,11 +9610,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr "クリックしてこのダイアログを閉じ、編集を続ける"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9562,32 +9622,32 @@
 msgstr[0] "{0} を削除しました"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0}は次からなります:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr "設定解除"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr "APIバージョン: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "GPXレイヤーの変換"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr "データセット一貫性テスト"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr "問題はありませんでした"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr "次の問題が見つかりました:"
@@ -9632,28 +9692,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "GPSポイント"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPXファイル(*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "ファイル {0} は、\"{1}\"という名前でですが、読み込まれました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "{0}の解析中にエラー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "\"{0}\"を読み込めません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9665,34 +9724,34 @@
 "を読み取って、タイムゾーンを選択します。<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr "写真の時刻(exifから取得):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 msgid "Gps time (read from the above photo): "
 msgstr "(写真から読み取った)GPSの時刻: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr "タイムゾーンの選択: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "日付なし"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr "他の写真を開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "GPSレシーバーの写真から時刻を同期"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9702,64 +9761,64 @@
 "入力する形式を確認してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "不正な日付"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr "<GPXトラックがまだ読み込まれていません>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr "GPXトラック: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr "ほかのGPXトレースを開く"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr "タイムゾーン: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr "オフセット:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9767,46 +9826,47 @@
 "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
 msgstr[0] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr "GPXトラックに画像を関連づけます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr "関連付け"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr "不正なタイムゾーン"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr "不正なオフセット"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr "タイムゾーン: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr "分: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr "秒: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9815,5 +9875,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9823,21 +9883,21 @@
 "合できます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr "トラックへのフォトマッチに失敗しました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr "タイムゾーンとオフセットを調整してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 msgid "The selected photos do not contain time information."
 msgstr "選択した写真には時間情報がありません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr "写真は時間情報を含んでいません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -9847,17 +9907,17 @@
 "してください。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr "GPXトラックは、時間情報を持っていません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr "GPXトラックを選択しなければなりません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr "GPXトラックの選択がありません"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9868,5 +9928,5 @@
 "期待する形式: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9877,73 +9937,75 @@
 "期待されるフォーマット: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "EXIFからGPS位置を取得"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr "ディレクトリ走査の開始"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr "選択されたファイルのひとつがヌルでした"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "写真を取り込む"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "{0}を読み込んでいます ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, 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:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "ディレクトリ {0} を走査"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "ディレクトリ {0}に中身のないファイルが見つかりました\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "ディレクトリからファイルを入手中のエラー {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "ジオタグのついた画像"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr "GPXに関連づける"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "{0} 経由ノード。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
+#, 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:585
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -9952,5 +10014,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10047,10 +10109,10 @@
 msgstr "GPSマーカー"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../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:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10058,9 +10120,9 @@
 msgstr[0] "{0}は、{1}マーカーからなる"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "音声の同期"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10069,20 +10131,20 @@
 "す。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../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:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr "再生の最初に音声マーカーを作成します。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -10090,17 +10152,17 @@
 msgstr "マークしたいトラックポイントでオーディオを一時停止する必要があります。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 msgid "No existing audio markers in this layer to offset from."
 msgstr "このレイヤーには、開始オフセットを指すオーディオマーカーがありません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "テキスト/アイコンの表示/非表示"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 msgid "Toggle visible state of the marker text and icons."
 msgstr "マーカーテキストとアイコンの表示状態を切り替え"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
+#: ../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 "
@@ -10110,5 +10172,5 @@
 "グする必要があります。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -10118,5 +10180,5 @@
 "ントの上に持ってくる必要があります。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "新しいオーディオマーカーを生成できません"
@@ -10142,15 +10204,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
+#, java-format
 msgid ""
 "Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr "警告: ''{0}'' からMOTD の読み込みに失敗。例外: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
+#, java-format
 msgid ""
 "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr "警告: ''{0}'' からMOTD の読み込みに失敗。例外: {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
@@ -10198,8 +10260,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize URL:"
-msgstr "作者"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10289,8 +10349,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize now"
-msgstr "作者"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10349,8 +10407,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
-#, fuzzy
-#| msgid "Authorisation Failed"
 msgid "OAuth authorization failed"
-msgstr "認証失敗"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
@@ -10430,8 +10486,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
-#| msgid "Please select at least four nodes."
 msgid "Please select an authorization procedure: "
-msgstr "少なくとも４つのノードを選択してください。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10441,8 +10495,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
-#, fuzzy
-#| msgid "Close dialog and cancel downloading"
 msgid "Close the dialog and cancel authorization"
-msgstr "ダイアログを閉じてダウンロードをキャンセル"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
@@ -10496,8 +10548,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498
-#, fuzzy, java-format
-#| msgid "Missing required attribute ''{0}''."
+#, java-format
 msgid "Authorizing request token ''{0}''..."
-msgstr "必要な属性 ''{0}'' がありません。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:504
@@ -10717,5 +10768,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
-#, fuzzy
 msgid ""
 "<html>The test failed because the server responded with an internal error."
@@ -10723,6 +10773,4 @@
 "</html>"
 msgstr ""
-"<html>OSM サーバ<br>''{0}''<br>からサーバの内部エラーの連絡がありました。<br>"
-"おそらく一時的な問題です。後ほどやり直してみてください。</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
@@ -10759,5 +10807,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "編集する列を選択してください。"
@@ -10771,5 +10819,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10918,9 +10966,4 @@
 msgstr "塗りつぶしスタイル{0}:{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "レイヤー: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -10950,6 +10993,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr "全て"
@@ -10988,8 +11031,8 @@
 msgstr "単色（namedレイヤーからカスタマイズ可能）"
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "自動車"
@@ -11011,13 +11054,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "自転車"
@@ -11050,12 +11093,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "徒歩"
@@ -11305,5 +11348,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:119
 msgid "Enter a search expression"
-msgstr ""
+msgstr "検索表現を入力してください"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:172
@@ -11397,5 +11440,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
-#, fuzzy
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11410,5 +11452,5 @@
 "to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US "
 "keyboard...</p>"
-msgstr "<p>次ページのキー選択一覧は全種類のJava が知りうるあらゆるキーボードをリストしており、あなたのキーボード上にあるキーではないことにご注意ください。あなたのキーボード上にある実際のキーに対応する値だけを使用してください。もしあなたのキーボードに ''Copy'' キーが無い場合 (PC キーボードにはありません、Sun のキーボードにはあります)、使用しないでください。 また、あなたのキーボード上のショーツカットに対応するリストされた''key'' もあります。(例： '':''/Colon)。これも同様に使わないでください。代わりにベースキー(US キーボードの'';''/Semicolon 、ドイツキーボードの ''.''/Period 、...) を使ってください。そうしないと競合を引き起こす場合があります。JOSM には Ctrl+Shift+; and Ctrl+: がUS キーボードでは実際には同じことだと知る手立てが無いのです...</p>"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
@@ -11435,9 +11477,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:183
-#, fuzzy
 msgid ""
 "<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
 "encountered.</p>"
-msgstr "<p>擬似変更 ''disabled'' は、次に起こったときにショートカットを無効にします。</p>"
+msgstr ""
 
 #. scroll up
@@ -12009,4 +12050,6 @@
 "JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
 msgstr ""
+"警告: JOSM はプロキシを参照するように設定されていますが、JVMはプロキシを参照"
+"するように設定されていません。"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
@@ -12030,5 +12073,12 @@
 msgstr "タグテーブルの選択を削除"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -12036,18 +12086,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "オプションの属性："
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr "閉じたウェイ"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "不明なタイプ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -12058,16 +12108,16 @@
 msgstr "タグ付けプレセットのソース {0} を読み込めません。"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "走査時にエラー: {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "タイプ{0}の要素がサポートされます"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -12075,18 +12125,17 @@
 msgstr[0] "{0}このオブジェクトを変更"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "何も選択されていません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "選択が適切ではありません！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "プリセットの適用"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "プロパティを変更する"
@@ -12143,9 +12192,9 @@
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
 "capabilities. Got ''{2}''"
-msgstr "XML タグ ''{1}'' の属性 ''{0}'' に不正な値。入力値: {2}。"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
@@ -12370,6 +12419,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12394,9 +12443,9 @@
 msgstr "ファイル \"{0}\" の解析に失敗"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "パースエラー：GPXファイルのドキュメント構造が不適切です"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12412,7 +12461,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
-#, fuzzy
 msgid "Looking for image files"
-msgstr "岸を検索中…"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
@@ -12420,15 +12468,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, fuzzy, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "警告: ''{0}'' からMOTD の読み込みに失敗。例外: {1}"
+
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#, fuzzy, java-format
+#, 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
@@ -12495,5 +12547,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "座標をインポートしました。 "
@@ -12596,8 +12648,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "{0} オブジェクトをアップロード中 ..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -12741,4 +12794,6 @@
 "''create'', ''modify'', or ''delete''."
 msgstr ""
+"データの形式に誤りがあります。ノード、ウェイ、リレーションの何れかが "
+"\"cretate\"、\"modify\"、\"delete\" ではない箇所に記述されています。"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:259
@@ -13142,8 +13197,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159
-#, fuzzy, java-format
+#, java-format
 msgid "({0}/{1}) Uploading {2} object..."
 msgid_plural "({0}/{1}) Uploading {2} objects..."
-msgstr[0] "{0} オブジェクトをアップロード中 ..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
@@ -13210,5 +13266,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Loading of the plugin \"{0}\" was requested.<br>This plugin is no "
@@ -13216,7 +13272,4 @@
 "disabled.<br>Delete from preferences?</html>"
 msgstr ""
-"<html>プラグイン {0} が読み込まれました。<br>このプラグインは開発を終了してい"
-"て、問題を起こす可能性があります。<br>無効にしてください。<br>使用をやめます"
-"か？</html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:167
@@ -13232,7 +13285,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:194
-#, fuzzy
 msgid "Click to update the activated plugins"
-msgstr "クリックしてダイアログを閉じる"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
@@ -13245,5 +13297,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -13252,5 +13304,5 @@
 "are:"
 msgstr[0] ""
-"プラグイン {0} は、プラグイン {1} の動作に必要ですが、見つかりませんでした。"
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13322,4 +13374,5 @@
 "them manually."
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:567
@@ -13334,7 +13387,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:625
-#, fuzzy, java-format
+#, java-format
 msgid "Click to delete the plugin ''{0}''"
-msgstr "クリックしてダイアログを閉じる"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
@@ -13370,7 +13423,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#, fuzzy, java-format
+#, java-format
 msgid "Click to disable the plugin ''{0}''"
-msgstr "クリックしてダイアログを閉じる"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:731
@@ -13414,12 +13467,11 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:890
-#, fuzzy
 msgid "Do not check and ask again at startup (remembers choice)"
-msgstr "次回から表示しない"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:69
-#, fuzzy, java-format
+#, java-format
 msgid "The plugin file ''{0}'' does not include a Manifest."
-msgstr "ファイル \"{0}\" はありません"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:181
@@ -13516,5 +13568,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13522,9 +13573,4 @@
 "file a bug report."
 msgstr ""
-"予想外の例外が発生しました。\n"
-"\n"
-"これは通常プログラミングの誤りです。最新のJOSMのバージョンを使っている場合に"
-"は、\n"
-"大目にみて、ぜひバグレポートをぜひお願いします。"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13623,6 +13669,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -13763,6 +13809,6 @@
 msgstr "Unable to find translation for the locale {0}. Reverting to {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13773,5 +13819,5 @@
 "外: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -13933,4 +13979,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr "表示"
@@ -14021,5 +14068,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "アドレスの補間"
@@ -14629,5 +14676,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr "ロケーション"
@@ -14793,21 +14840,21 @@
 "分割の前にエリアをリレーションから削除してください。"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr "TangoGPS ファイル (*.log)"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr "フォーマットエラー: "
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr "TangoGPS のインポートに成功しました。"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr "TangoGPS のインポートに失敗しました。"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr "TCX ファイル (*.tcx)"
@@ -14839,9 +14886,9 @@
 msgstr "複製したウェイの作成"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr "GPSトラックを編集するためのレイヤーです。"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr "匿名時間も含めたGPXレイヤーへのコンバート"
@@ -14849,5 +14896,5 @@
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:49
 msgid "edit gpx tracks"
-msgstr "gpxトラックを編集してください。"
+msgstr "gpxトラックの編集"
 
 #: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxPlugin.java:88
@@ -14856,13 +14903,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr "GPXレイヤーからパスをインポート"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr "今あるパスをドロップ"
@@ -14871,6 +14918,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr "GPXデータのレイヤーがありません"
@@ -15100,17 +15147,17 @@
 msgstr "新規レイヤーとして画像セットを読み込む."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../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:109
+#: ../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:114
+#: ../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:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -15154,42 +15201,41 @@
 msgstr "重複したノードの削除中…"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../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:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr "不明なエラーが発生"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "東"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "北東"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "北"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "北西"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "西"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "南西"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "南"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "南東"
@@ -15245,6 +15291,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -15253,73 +15299,73 @@
 msgstr "水域(湖沼)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "海岸線"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "陸地"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../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:43
+#: ../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:45
+#: ../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:47
+#: ../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:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "ランドサットタイルの解像度(度あたりのピクセル)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr "ランドサットタイルのサイズ (ピクセル)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../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:55
+#: ../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:57
+#: ../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:59
+#: ../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:61
+#: ../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:63
+#: ../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:65
+#: ../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:67
+#: ../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:70
+#: ../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:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -15329,5 +15375,5 @@
 "ト50000）"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -15337,5 +15383,5 @@
 "である．デフォルトは90。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -15345,58 +15391,58 @@
 "行います。 既定値 0.0003。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr "ピクセル/度 単位のランドサットタイルの解像度。デフォルトは 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "ランドサットの一タイルのサイズをピクセル単位で。既定値は２０００"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../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:77
+#: ../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:78
+#: ../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:79
+#: ../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:80
+#: ../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:81
+#: ../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:82
+#: ../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:83
+#: ../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:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "ランドサット画像上での水域トレース用プラグイン"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../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:48
+#: ../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:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr "イメージを取得できませんでした"
@@ -15420,5 +15466,5 @@
 msgstr "接続失敗"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr "名前なし"
@@ -15449,5 +15495,5 @@
 msgstr "コース"
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr "LiveGPSレイヤー"
@@ -15521,5 +15567,5 @@
 msgstr "選択した二つのノード間の角度"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr "測定するレイヤー"
@@ -15790,4 +15836,76 @@
 msgid "Firefox executable"
 msgstr "Firefoxの実行ファイル"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#, fuzzy
+msgid "Read error!"
+msgstr "ため池"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "新しいノードの座標を入力してください"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "バックアップファイルの保存"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "エラー"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "入力した時刻は、解釈できません"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "ファイル ''{0}'' をリネームできません"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "バックアップファイルの保存"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "バックアップファイルの保存"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "上書きする"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+#, fuzzy
+msgid "Could not delete temporary file!"
+msgstr "要素タイプを見つけられませんでした。"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
@@ -16066,6 +16184,6 @@
 msgstr "１分ごとに取得したデータをファイルに保存します。"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -16187,72 +16305,130 @@
 msgstr "まず、設定情報にあるタグ付けプレセットのソースを指定してください。"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+#, fuzzy
+msgid "Terrace a house"
+msgstr "建物のテラス"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+msgid "Interpolation"
+msgstr "補間"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "ストリート"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "最も大きな番号"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "最も小さな番号"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+#, fuzzy
+msgid "Lowest housenumber of the terraced house"
+msgstr "テラスの番地を逆にします。"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "新規リレーション作成"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "複製したウェイを削除"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "ストリートの名前"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr "最も小さな番号"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr "最も大きな番号"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr "テラスを反転"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr "テラスの番地を逆にします。"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr "テラスを反転"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:83
+#, fuzzy
+msgid "Cannot reverse!"
+msgstr "存在しません"
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:125
 msgid "Reverse Terrace"
 msgstr "テラスを反転"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr "建物のテラス"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr "長い建物から個別の建物を生成"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr "最低4ノード以上の単一のクローズドウェイを選択"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr "テラスハウス"
@@ -16489,5 +16665,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr "ノードの複製"
@@ -16497,5 +16673,5 @@
 msgstr "このテストは全く同じ位置にノードがないことをチェックします。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16507,9 +16683,9 @@
 "起こします。<br>本当に削除しますか？"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr "確認"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr "同位置のノード"
@@ -16544,5 +16720,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr "マルチポリゴン"
@@ -16691,7 +16867,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr "不正なタグ/値の組み合わせです"
@@ -16699,80 +16875,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr "色つけに問題発生"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "キー ''{0}''は不正です。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr "値のないタグ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr "プロパティキーが不正です"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr "プロパティのキーとして、不正なスペースが入っています。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr "値で、空白文字を最初か最後にあるプロパティ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr "HTML書式の値を持つプロパティ"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "キー ''{0}'' はプリセットにはありません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr "プリセットはプロパティキーを含みません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "キー ''{1}'' の値 ''{0}'' はプリセットにはありません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr "プリセットは属性値を含みません。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr "プロパティのキーをチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "ワードのリストをチェックしてプロパティキーが正しいか検証。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr "高度なプロパティチェッカーを使用"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr "混合ルールを使用しているプロパティの値とタグを検証"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr "タグチェッカーのソース"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16782,86 +16958,86 @@
 "index.php/User:JLS/speller 参照) またはタグをチェックするデータファイル。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr "新しいソースをリストに追加"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr "選択したソースの編集"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "リストから選択した情報源を削除"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "データソース"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr "プロパティの値をチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr "プリセットをチェックしてプロパティの値が正しいか検証。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr "FIXMEをチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 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:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr "Check for paint notes."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr "地図塗りつぶしでデータエラーがあるかどうかチェック"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr "既定のデータファイルを使用。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr "既定のデータファイルを使用(推奨)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr "デフォルトタグを使用、ファイルを無視。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr "デフォルトタグを使用、ファイルを無視（推奨）。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr "既定のスペルチェックファイルを使用"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr "既定のスペルチェックファイルを使用(推奨)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr "プロパティを修正"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr "要素タイプを見つけられませんでした。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr "警告レベルを見つけられませんでした"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "不正な表現\"{0}\""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -17239,5 +17415,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:42
 msgid "Adjust the position of the selected WMS layer"
-msgstr "選択されたWMSレイヤーの位置を調整してください。"
+msgstr "WMSレイヤーの位置を調整"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:172
@@ -17313,5 +17489,5 @@
 msgstr "WMS レイヤー ({0}), 自倍率 {1} でダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -17325,64 +17501,64 @@
 "設定を<br>チェックしてください。<br>強制的にWMS タイルを取得しますか？"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr "はい、画像を取得します"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr "不正なURL？"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
-msgid ""
-"The requested area is too big. Please zoom in a little, or change resolution"
-msgstr ""
-"要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
 msgid "Download visible tiles"
 msgstr "見えるタイルのダウンロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+msgid ""
+"The requested area is too big. Please zoom in a little, or change resolution"
+msgstr ""
+"要求された範囲は大きすぎます。もう少し拡大するか、解像度を変更してください。"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "解像度の変更"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr "誤ったタイルのリロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr "アルファチャンネル"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "WMSレイヤーをファイルに保存"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr "WMS レイヤーを保存"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "WMSレイヤーをファイルから読み込む"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr "WMS レイヤーをロード"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "未サポートの WMSファイルのバージョン; 発見 {0}, 予想 {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr "ファイルフォーマットエラー"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "ファイルの読み込みエラー"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr "WMSブックマークをセット"
@@ -17517,5 +17693,9 @@
 "sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange but "
 "true :-)"
-msgstr "ユーザは異なる色スキームを作成し、切り替えることができます。色を変えて新しいスキームを作成してください。明るい自然光の中で視認性を上げるには一致する色の白い背景に切り替えるのに使われます。JOSMの設定にあるダイアログと ''Map Settings'' を参照してください(奇妙ですが本当です :-)"
+msgstr ""
+"ユーザは異なる色スキームを作成し、切り替えることができます。色を変えて新しい"
+"スキームを作成してください。明るい自然光の中で視認性を上げるには一致する色の"
+"白い背景に切り替えるのに使われます。JOSMの設定にあるダイアログと ''Map "
+"Settings'' を参照してください(奇妙ですが本当です :-)"
 
 #. Plugin Create_grid_of_ways
@@ -17581,5 +17761,8 @@
 "made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches "
 "the filename of an image."
-msgstr "画像をGPX ファイル内のウェイポイントと照合する別のプラグイン。照合はウェイポイントタグの ''name'', ''cmt'' または ''desc'' 属性が画像のファイル名と一致したときに行われます。"
+msgstr ""
+"画像をGPX ファイル内のウェイポイントと照合する別のプラグイン。照合はウェイポ"
+"イントタグの ''name'', ''cmt'' または ''desc'' 属性が画像のファイル名と一致し"
+"たときに行われます。"
 
 #. Plugin lakewalker
@@ -17655,6 +17838,13 @@
 "Firefoxを起動する。"
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17665,15 +17855,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "偉大なJGoodies のプラスティック風のルック＆フィール。"
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr "他のアプリーケーションにJOSM へのコマンドを送信させる"
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17685,10 +17875,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr "ルーティング能力の提供"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17699,15 +17889,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "表形式でタグ編集のダイアログ・ボックスを提供"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17720,10 +17910,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr "一つのブロックからテラスハウスを作成する"
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17734,5 +17924,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17743,10 +17933,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "長い相互接続されたウェイのセットに沿って簡単にダウンロード"
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -17853,6 +18043,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -17860,6 +18059,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "道路番号"
@@ -17876,5 +18076,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "車線数"
@@ -17896,10 +18096,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "最高速度（km/h）"
@@ -17943,14 +18143,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "一方通行"
@@ -17993,13 +18193,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -18037,13 +18237,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "トンネル"
@@ -18078,13 +18278,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "切り通し"
@@ -18119,13 +18319,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "土手"
@@ -18257,4 +18457,13 @@
 msgid "Edit Unclassified Road"
 msgstr "一般道(2車線未満)の編集"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr ""
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -18272,15 +18481,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr "幅(m)"
@@ -18292,5 +18501,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "居住区域内道路"
@@ -18299,5 +18508,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "居住区域内道路の編集"
@@ -18315,16 +18524,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "表面"
@@ -18346,166 +18558,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr "舗装"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr "未舗装"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr "アスファルト"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr "コンクリート"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr "金属"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "森"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr "敷石"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr "敷石"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "砂利道"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr "小石"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr "圧縮"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr "敷石混じりの芝"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "草地"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "砂地"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr "地表"
@@ -18513,5 +18732,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr "私道"
@@ -18520,5 +18739,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr "私道の編集"
@@ -18526,5 +18745,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "歩行者専用道路"
@@ -18533,5 +18752,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "歩行者専用道路の編集"
@@ -18539,5 +18758,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr "敷地内道路"
@@ -18546,5 +18765,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr "敷地内道路の編集"
@@ -18554,18 +18773,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr "敷地内道路のタイプ"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr "裏通り・路地"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr "私道"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr "駐車場の通路"
@@ -18573,5 +18792,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr "駐車場の通路"
@@ -18581,5 +18800,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr "駐車場の通路の編集"
@@ -18587,5 +18806,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "道路（種別不明)"
@@ -18594,5 +18813,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "種別不明道路の編集"
@@ -18601,20 +18820,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "通行制限"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "通行制限の編集"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "料金"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "行き止まり(cul-de-sac)"
@@ -18622,9 +18841,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 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"
@@ -18635,6 +18855,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18646,4 +18864,5 @@
 #. 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"
@@ -18662,141 +18881,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "私道"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr "関係車両のみ可"
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr "農業の"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "私道"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "行き先"
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr "関係車両のみ可"
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr "農業の"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "いいえ"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr "貨物トラック"
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "大型車"
@@ -18811,10 +19038,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr "馬"
@@ -18830,10 +19057,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "自動二輪"
@@ -18848,27 +19075,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr "自動車"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr "公共交通機関(psv)"
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr "モーターボート"
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "ボート"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "最小速度（km/h)"
@@ -18876,25 +19095,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "最大重量（トン）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr "最大高（ｍ）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr "最大幅（ｍ）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr "最大長（ｍ）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "ロータリー交差点"
@@ -18905,5 +19124,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "ジャンクションの編集"
@@ -18923,10 +19142,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "自動車専用道路"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr "自動車専用道路の連結路"
@@ -18948,10 +19167,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "国道"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr "国道の連絡路"
@@ -18973,10 +19192,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "主要地方道"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr "主要地方道の連絡路"
@@ -18998,5 +19217,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -19011,9 +19230,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "一般道(2車線以上)"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr "一般道(2車線未満)"
@@ -19027,9 +19246,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "居住区域内道路"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr "私道"
@@ -19059,10 +19278,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "敷地内道路"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr "バスレーン"
@@ -19092,5 +19311,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -19102,10 +19321,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "橋の編集"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr "トンネルの編集"
@@ -19113,19 +19332,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "ウェイ"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "工事中"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "工事中道路の編集"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "ジャンクション"
@@ -19141,5 +19360,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "ロータリー交差点"
@@ -19147,5 +19366,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr "トラック"
@@ -19154,40 +19373,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr "トラックの編集"
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "トラック"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "砂利道"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "砂利道"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "砂利道"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "砂利道"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "砂利道"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr ""
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -19195,5 +19408,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -19201,37 +19414,32 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr "ハイキング"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "マウンテンバイク"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
-msgstr "厳しい山岳ハイキング"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
-msgstr "高山ハイキング"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
-msgstr "厳しい高山ハイキング"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
-msgstr "困難な高山ハイキング"
+msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "小道"
@@ -19240,12 +19448,32 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "小道の編集"
 
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr "中間"
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
+
 #: build/trans_presets.java:489
-#, fuzzy
 msgid "Wheelchairs"
-msgstr "車いす"
+msgstr ""
 
 #: build/trans_presets.java:490
@@ -19261,7 +19489,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "馬道の編集"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -19274,7 +19501,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "自転車道の編集"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -19309,24 +19535,21 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "強制的に連結。"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "遊歩道の編集"
+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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "遊歩道の編集"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr "自転車"
@@ -19334,5 +19557,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "階段"
@@ -19342,5 +19565,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "階段を編集"
@@ -19348,10 +19571,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr "ウェイポイント"
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "自動車専用道路のジャンクション"
@@ -19359,15 +19582,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "自動車専用道路ジャンクションの編集"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "数"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "敷地内道路"
@@ -19375,5 +19598,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr "サービスステーションの編集"
@@ -19381,5 +19604,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -19412,17 +19636,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "操作員"
@@ -19431,5 +19655,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "信号機"
@@ -19439,5 +19663,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr "横断歩道タイプ"
@@ -19446,27 +19670,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr "マークだけ"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr "信号機"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "途中に島あり"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr "マークなし"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr "馬用横断道"
@@ -19474,6 +19698,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr "自転車用横断歩道"
@@ -19482,11 +19706,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr "踏切係員"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr "踏切タイプ名(UK)"
@@ -19494,30 +19718,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr "横断歩道"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr "ペリカン柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr "Toucan柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr "ツノメドリ"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr "ペガサス柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr "虎縞柄横断歩道（ＵＫ）"
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "停止"
@@ -19525,5 +19749,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr "横断歩道"
@@ -19532,14 +19756,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr "踏切の編集"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr "タイプ名(UK)"
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr "小さなラウンドアバウト"
@@ -19550,14 +19820,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr "方向"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr "時計回り"
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr "転回場"
@@ -19567,26 +19837,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "市境界標識"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "市境界標識の編集"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr "二つ目の名前"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "緊急電話"
@@ -19594,5 +19866,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr "坂"
@@ -19600,5 +19872,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr "急な坂"
@@ -19606,11 +19878,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr "浅瀬（洗い越し）"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr "浅瀬（歩いて渡る）"
@@ -19618,5 +19897,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr "峠道"
@@ -19624,5 +19903,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr "峠道の編集"
@@ -19634,7 +19913,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "高度"
@@ -19642,5 +19921,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "ゲート等"
@@ -19648,5 +19927,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr "車止め杭"
@@ -19654,5 +19933,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr "bollardの編集"
@@ -19697,16 +19976,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "許可された通行："
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr "自転車止め"
@@ -19715,5 +19994,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr "ブロック"
@@ -19722,5 +20001,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr "Cattle Grid(家畜用格子柵)"
@@ -19728,5 +20007,5 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr "Cattle Gridの編集"
@@ -19734,5 +20013,5 @@
 # http://en.wikipedia.org/wiki/Bus_trap
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr "バスだけが通行可能になる落とし穴"
@@ -19740,15 +20019,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr "車止めのとげ"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr "車止めのとげの編集"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "料金所"
@@ -19756,5 +20035,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "料金所の編集"
@@ -19762,10 +20041,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr "国境検査所"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr "国境検査所の編集"
@@ -19775,5 +20054,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr "生け垣"
@@ -19782,12 +20061,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:817 build/trans_presets.java:819
 msgid "Fence"
 msgstr "フェンス"
 
-#. item "Barriers/Fence"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "壁"
@@ -19795,5 +20086,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "城壁"
@@ -19802,5 +20093,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr "擁壁"
@@ -19812,15 +20103,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr "入口"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr "入り口の編集"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "ゲート"
@@ -19828,50 +20120,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr "ゲートの編集"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr "引き上げゲート"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr "引き上げゲートの編集"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr "Hampshire Gate"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr "Hampshire Gateの編集"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr "竹のゲート"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr "竹のゲートの編集"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr "幅の狭いゲート"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr "幅の狭いゲートの編集"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr "踏み越し段"
@@ -19879,25 +20171,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr "Stileの編集"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr "回転式木戸"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr "回転式木戸を編集"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr "城の出撃路"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr "城の出撃路の編集"
@@ -19908,11 +20200,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "水域(湖沼)"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "泉"
@@ -19920,5 +20212,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "泉の編集"
@@ -19926,5 +20218,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr "側溝"
@@ -19932,10 +20224,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr "川(drain)の編集"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "小川"
@@ -19943,10 +20246,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "小川の編集"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "運河"
@@ -19954,10 +20257,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "運河の編集"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "川"
@@ -19967,5 +20270,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "河川の編集"
@@ -19973,15 +20276,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "水域の編集"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "陸地"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "陸地の編集"
@@ -19989,5 +20292,5 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr "水たまり、窪地"
@@ -19995,10 +20298,10 @@
 # 水たまりになるような土地
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr "窪地、水盤場の盆地"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr "ため池"
@@ -20006,15 +20309,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr "ため池の編集"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr "蓋付きため池"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr "蓋のされたため池の編集"
@@ -20022,5 +20325,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "川岸"
@@ -20029,10 +20332,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "川岸の編集"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr "湿地帯"
@@ -20043,14 +20346,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr "湿地帯の編集"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "沼地"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr "湿地"
@@ -20064,35 +20367,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr "沼地、湿地"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr "葦原"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr "塩湖"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr "干潟"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr "マングローブ"
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "泥地"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr "泥地の編集"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "砂浜"
@@ -20100,20 +20403,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "砂浜の編集"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "湾"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "湾の編集"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "崖"
@@ -20121,10 +20424,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "崖の編集"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "海岸線"
@@ -20132,5 +20435,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "海岸線の編集"
@@ -20138,5 +20441,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "フェリー航路"
@@ -20144,5 +20447,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr "フェリー航路の編集"
@@ -20151,5 +20454,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr "ボートヤード(陸上の船置き場)"
@@ -20157,10 +20460,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr "ボートヤードの編集"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "ドック"
@@ -20168,5 +20471,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr "ドックの編集"
@@ -20174,5 +20477,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "ダム"
@@ -20180,15 +20483,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "ダムの編集"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr "水路ポイント"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr "ロックゲート"
@@ -20197,5 +20500,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr "堰"
@@ -20203,20 +20506,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr "ダムの編集"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "滝"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "滝の編集"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr "転回地点"
@@ -20225,15 +20528,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr "マリーナ"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr "マリーナの編集"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "桟橋"
@@ -20241,10 +20544,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "桟橋の編集"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr "フェリーターミナル"
@@ -20252,10 +20555,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr "フェリーターミナルの編集"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr "スリップウェイ(進水所)"
@@ -20265,20 +20568,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr "スリップウェイの編集"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr "輸送"
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "鉄道"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "線路"
@@ -20286,5 +20589,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr "線路の編集"
@@ -20293,139 +20596,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr "標準"
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr "中庭"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr "待避線"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr "分岐線"
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr "線路"
+
+#. item "Man Made/Power Line" text "Line reference"
+#. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
+#: build/trans_presets.java:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr "トロッコ線路（狭軌）"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr "トロッコ線路（狭軌）の編集"
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr "モノレール"
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr "モノレールの編集"
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr "保存鉄道"
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr "保存鉄道の編集"
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr "路面電車（ライトレール）"
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr "路面電車（ライトレール）の編集"
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "地下鉄"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "地下鉄の編集"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "路面電車（トラム）"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr "路面電車（トラム）の編集"
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr "バスレーン"
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr "バス車線の編集"
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "使われていない線路"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "使われていない線路の編集"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr "追加のタイプ"
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr "中庭"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr "待避線"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr "分岐線"
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr "トロッコ線路（狭軌）"
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr "トロッコ線路（狭軌）の編集"
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr "モノレール"
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr "モノレールの編集"
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr "保存鉄道"
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr "保存鉄道の編集"
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr "路面電車（ライトレール）"
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr "路面電車（ライトレール）の編集"
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "地下鉄"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "地下鉄の編集"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "路面電車（トラム）"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr "路面電車（トラム）の編集"
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr "バスレーン"
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr "バス車線の編集"
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "使われていない線路"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "使われていない線路の編集"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "廃棄された線路"
@@ -20434,5 +20976,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr "踏切"
@@ -20441,5 +20983,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr "踏切（遮断機なし）"
@@ -20449,5 +20991,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr "踏切のタイプ"
@@ -20455,5 +20997,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "転車台（ターンテーブル）"
@@ -20462,10 +21004,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr "リフト"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "いすリフト"
@@ -20473,10 +21022,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr "いすリフトの編集"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr "Tバーリフト"
@@ -20484,10 +21033,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr "Tバーリフト"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "ケーブルカー"
@@ -20495,10 +21044,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "ケーブルカーの編集"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr "ゴンドラ"
@@ -20506,10 +21055,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr "ゴンドラを編集"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20517,12 +21066,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr "駅の編集"
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "ガソリンスタンド"
@@ -20532,9 +21094,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "ガソリンスタンドの編集"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20588,32 +21207,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "営業時間"
@@ -20672,94 +21291,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr "月-金 08:30-20:00"
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 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:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20771,5 +21466,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20779,5 +21474,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "駐車場の編集"
@@ -20788,25 +21483,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr "参照番号"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "多階の建物"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "表面"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr "地下"
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr "パークアンドライド"
@@ -20815,48 +21510,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "料金"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr "収容能力（全体）"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr "障がい者用スペース"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr "女性用スペース"
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr "保護者用スペース"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "他の収容能力はWiki を参照:[types]=*。"
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "洗車場"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "洗車場の編集"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "自動車修理"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "自動車修理工場の編集"
@@ -20864,5 +21559,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "レンタル"
@@ -20871,10 +21566,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "レンタカーの編集"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr "自家用車共有"
@@ -20882,5 +21577,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr "カーシェアリング"
@@ -20888,10 +21583,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "駐輪場の編集"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr "収容台数"
@@ -20900,15 +21595,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "自転車レンタルの編集"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "公共交通機関"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -20918,5 +21613,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -20924,5 +21619,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -20930,5 +21625,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr "停車場"
@@ -20936,5 +21631,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr "停止線の編集"
@@ -20942,5 +21637,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "トラム停車場"
@@ -20949,5 +21644,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "トラム停車場の編集"
@@ -20955,5 +21650,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "鉄道のプラットホーム"
@@ -20962,5 +21657,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "鉄道のプラットホームの編集"
@@ -20972,5 +21667,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr "リファレンス (ホームの番号)"
@@ -20978,10 +21673,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr "エリア"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "地下鉄の入口"
@@ -20990,10 +21685,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "地下鉄入口の編集"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr "車いす"
@@ -21002,5 +21697,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "バスターミナル"
@@ -21009,5 +21704,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "バスターミナルの編集"
@@ -21015,5 +21710,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "バス停"
@@ -21023,5 +21718,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "バス停の編集"
@@ -21030,25 +21725,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr "避難所"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "ベンチ"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr "点字ブロック"
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr "バス乗り場"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr "バス乗り場の編集"
@@ -21056,5 +21752,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "タクシー"
@@ -21062,5 +21758,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "タクシー乗り場の編集"
@@ -21068,32 +21764,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "空港"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr "空港の編集"
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr "IATA"
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr "ICAO"
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr "旅行"
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "宿泊施設"
@@ -21105,5 +21896,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "ホテル"
@@ -21112,15 +21903,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "ホテルの編集"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "星の数"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr "モーテル"
@@ -21128,20 +21919,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr "モーテルの編集"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr "ゲストハウス"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr "ゲストハウスの編集"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "シャレー風の別荘、シャレー"
@@ -21149,10 +21940,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr "シャレー風の別荘の編集"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr "ホステル"
@@ -21160,30 +21951,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr "ホステルの編集"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr "山小屋"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr "山小屋の編集"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr "ハウストレーラー用駐車場"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr "ハウストレーラー用駐車場の編集"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "キャンプ場"
@@ -21191,10 +21982,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr "キャンプ場の編集"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "飲食店"
@@ -21205,5 +21996,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "レストラン"
@@ -21211,5 +22002,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "レストランの編集"
@@ -21217,5 +22008,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr "料理の種類"
@@ -21223,61 +22014,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "イタリアン"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "中国料理"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "ピザ"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "バーガー"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "ギリシャ料理"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "ドイツ料理"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "インド料理"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "郷土料理"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr "カバブ"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "トルコ料理"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "アジア各国料理"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "タイ料理"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "メキシコ料理"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "日本食"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "ファーストフード"
@@ -21285,9 +22088,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "ファーストフード店の編集"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "カフェ"
@@ -21295,9 +22106,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "カフェの編集"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "パブ、居酒屋"
@@ -21305,18 +22116,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "パブの編集"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr "ビアガーデン"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr "ビアガーデンの編集"
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr "バー"
@@ -21324,9 +22135,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr "バーの編集"
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "ナイトクラブ"
@@ -21334,24 +22145,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "ナイトクラブの編集"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "旅行"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr "アトラクション"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr "アトラクションの編集"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "博物館"
@@ -21359,9 +22170,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "博物館の編集"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "動物園"
@@ -21370,9 +22181,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "動物園の編集"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "観覧台"
@@ -21380,24 +22191,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "View pointの編集"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "テーマパーク"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr "テーマパークの編集"
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "美術館"
@@ -21405,5 +22216,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "美術館の編集"
@@ -21411,19 +22222,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr "案内所"
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "マップ"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr "詳細なグレード"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr "地形"
@@ -21461,5 +22272,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -21467,28 +22278,28 @@
 msgstr "ストリート"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr "スキーム"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr "表示されたエリア"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr "サイト"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr "市区"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr "地方"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr "詳細な説明"
@@ -21498,5 +22309,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr "表示されたルート:"
@@ -21504,5 +22315,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr "ハイキング"
@@ -21510,6 +22321,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "サイクリング"
@@ -21517,5 +22328,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr "マウンテンバイク"
@@ -21523,6 +22334,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "スキー"
@@ -21530,5 +22341,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr "乗馬"
@@ -21536,46 +22347,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr "... 他の可能な輸送モード"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr "情報板"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr "掲示板の内容"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr "通知"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "履歴"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr "自然"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr "野生生物"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr "植物"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr "道しるべ"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr "情報端末"
@@ -21583,29 +22394,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr "詳細な説明"
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr "音声ガイド"
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr "携帯電話経由の音声ガイド？"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr "電話番号"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr "その他の情報ポイント"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr "シェルターの編集"
@@ -21613,25 +22424,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr "野外炉"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "ピクニック場(野外調理場)"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "ピクニック場の編集"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "史跡"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "城"
@@ -21640,19 +22451,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "城の編集"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "遺跡"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "遺跡(ruins)の編集"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "遺跡（群）"
@@ -21661,9 +22472,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "遺跡（群）の編集"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "戦場跡"
@@ -21671,32 +22482,32 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "戦場跡の編集"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
-msgstr "住居跡"
+msgstr "化石サイト"
 
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
-msgstr "住居跡の編集"
+msgstr "化石サイトの編集"
 
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "記念塔(モニュメント)"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "モニュメントの編集"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "記念碑(戦争記念などの)"
@@ -21704,55 +22515,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "記念碑の編集"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr "道路際の十字架"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr "道路際の十字架の編集"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr "道祖神"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr "道祖神の編集"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr "境界石"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr "境界石を編集"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "レジャー"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "遊泳用プール"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "遊泳用プールの編集"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "遊び場"
@@ -21760,35 +22571,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "運動公園の編集"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "つり"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "つりの編集"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr "スポーツ"
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr "スポーツ施設"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "スタジアム"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "スタジアムの編集"
@@ -21802,6 +22613,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "スポーツ選択："
@@ -22193,6 +23004,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -22226,225 +23037,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr "多目的"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "アーチェリー"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr "アスレチック"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "オーストラリアフットボール"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "野球"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "バスケットボール"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr "ペタンク"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr "ボーリング"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr "カヌー"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "登山"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr "クリケット"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr "クリケットネット"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr "クローク"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "サイクリング"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr "ドッグレース"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr "乗馬"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "フットボール"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "ゴルフ"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "体操"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "ホッケー"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr "競馬"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr "モータースポーツ"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr "ペロタ"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr "ラケットボール"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr "ラグビー"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "射撃"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr "スケートボード"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr "スケート"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "スキー"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "サッカー"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "水泳"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "卓球"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "テニス"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "スポーツセンター"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "スポーツセンターの編集"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr "運動場"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr "運動場の編集"
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr "競技トラック"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr "競技場のトラックの編集"
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "ゴルフコース"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "ゴルフコースの編集"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "ミニチュアゴルフ"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "ミニチュアゴルフの編集"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "スポーツ"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr "多目的"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr "Multiの編集"
@@ -22483,21 +23294,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "タイプ"
@@ -22536,203 +23347,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr "運動場"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "スポーツセンター"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "スタジアム"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr "トラック"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr "テンピンズ"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr "テンピンズの編集"
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr "アスレチック"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr "アスレチック場の編集"
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "アーチェリー"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "アーチェリーの編集"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "登山"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "登山の編集"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr "カヌー・競艇"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr "競艇場の編集"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr "サイクリングの編集"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "ドッグレース"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr "ドックレースの編集"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr "乗馬"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr "乗馬の編集"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr "競馬"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr "競馬場の編集"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "体操"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr "体操競技の編集"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "モータースポーツ"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr "モータースポーツの編集"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr "スケート"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr "スケート場の編集"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr "スケートボード"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr "スケートボードの編集"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "水泳"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "水泳の編集"
@@ -22740,56 +23551,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr "スキーの編集"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr "ゲレンデのタイプ"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr "ダウンヒル"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr "ノルディックスキー"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr "スノーパーク"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr "難易度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr "初心者"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr "初球"
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr "中間"
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr "高度"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr "エキスパート"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr "ただ乗り"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "射撃"
@@ -22797,127 +23604,127 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "射撃の編集"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "球技"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "サッカー"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr "サッカー場の編集"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "フットボール"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr "フットボール場の編集"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr "オーストラリアフットボール"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr "オーストラリアフットボールの編集"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "野球"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr "野球場の編集"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "バスケットボール"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "バスケットボール場の編集"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "ゴルフ"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr "ゴルフの編集"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "ゴルフコース"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr "ペタンク"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr "（ペタンクの）ブールの編集"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr "ボーリング"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr "ボーリング場の編集"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr "クリケット"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr "クリケットの編集"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr "クリケットネット"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr "クリケットネットの編集"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr "クロッケー"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr "クロッケーの編集"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "ホッケー"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "ホッケーの編集"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr "ペロタ"
@@ -22925,55 +23732,55 @@
 #  ペロタ 《スペイン・南米・フィリピンなどで行なわれる球技; ハイアライ (jai alai) に発展》.
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr "ペロタの編集"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr "ラケットボール"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr "ラケットボールの編集"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "ラグビー"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr "ラグビー場の編集"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "卓球"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "卓球の編集"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "テニス"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "テニスの編集"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr "建造物"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "建物"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "建物"
@@ -22981,5 +23788,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "公共の建物"
@@ -22987,10 +23794,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "公共の建物の編集"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "役場"
@@ -22998,10 +23805,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "役場の編集"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "大使館"
@@ -23009,10 +23816,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "大使館の編集"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "裁判所"
@@ -23021,10 +23828,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "裁判所の編集"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "刑務所"
@@ -23033,10 +23840,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "刑務所の編集"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "警察"
@@ -23046,10 +23853,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "警察署・交番の編集"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "消防署"
@@ -23058,10 +23865,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "消防署の編集"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "郵便局"
@@ -23069,5 +23876,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "郵便局の編集"
@@ -23075,15 +23882,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "幼稚園の編集"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "学校"
@@ -23091,10 +23898,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "学校の編集"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "大学"
@@ -23102,10 +23909,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "大学の編集"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "短大"
@@ -23113,5 +23920,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "短大の編集"
@@ -23119,5 +23926,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "映画館"
@@ -23126,10 +23933,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "映画館の編集"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "図書館"
@@ -23138,9 +23945,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "図書館の編集"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "美術館"
@@ -23148,10 +23955,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "美術館の編集"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "劇場"
@@ -23160,10 +23967,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "劇場の編集"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "礼拝所"
@@ -23173,5 +23980,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "礼拝所の編集"
@@ -23180,6 +23987,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "宗教"
@@ -23188,66 +23995,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr "バハーイ教"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "仏教"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "キリスト教"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "ヒンズー教"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr "ジャイナ教"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "ユダヤ教"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "ムスリム"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr "シーク教"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr "降霊術士、イタコ"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr "ユニテリアン"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr "ゾロアスター教"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr "宗派"
@@ -23256,81 +24063,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr "英国教会系"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "バプチスト"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "カトリック"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr "福音派"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr "ものみの塔、エホバの証人"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "ルター派"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr "メソジスト派"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr "モルモン"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "ギリシャ正教系"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr "ペンテコステ派"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr "長老派"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "プロテスタント"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr "クエーカー教徒"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr "シーア派"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr "スンニ派"
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "住所"
@@ -23339,5 +24146,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "住所情報の編集"
@@ -23345,5 +24152,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "番地"
@@ -23351,25 +24158,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "家の名前"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "ストリートの名前"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "都市名"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "郵便番号"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "国コード"
@@ -23378,5 +24185,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "住所の補間を編集"
@@ -23384,61 +24191,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr "番地付けルール"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "奇数"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "偶数"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr "アルファベット順"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr "人工物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "工場"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "工場の編集"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "タワー"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "タワーの編集"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr "塔の種類"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr "通信用"
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr "観察"
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr "高さ(メートル)"
@@ -23446,25 +24253,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "水道塔"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "水道塔の編集"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "ガスタンク"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "ガスタンクの編集"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "灯台"
@@ -23472,10 +24279,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "灯台の編集"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "風車"
@@ -23483,10 +24290,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "風車の編集"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "パイプライン"
@@ -23495,37 +24302,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "パイプラインの編集"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
+msgid "gas"
+msgstr "ガス"
+
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr "熱"
+
+#: build/trans_presets.java:2353
 msgid "oil"
 msgstr "石油"
 
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-msgid "gas"
-msgstr "ガス"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr "下水"
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr "熱"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr "どれかの実体"
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr "水中"
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr "地上"
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "下水処理場"
@@ -23535,10 +24342,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "下水処理場の編集"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "クレーン"
@@ -23546,21 +24353,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "クレーンの編集"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr "ビーコン"
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr "誘導灯の編集"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "調査ポイント"
@@ -23568,10 +24370,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "測点の編集"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "監視カメラ"
@@ -23579,11 +24381,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "監視カメラの編集"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "発電機"
@@ -23593,35 +24407,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "発電機の編集"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "風"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "水力発電"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "火力発電"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "原子力"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "石炭"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr "太陽光発電"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "変電所"
@@ -23630,10 +24444,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "変電所の編集"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "発電サブステーション"
@@ -23642,5 +24456,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "配電所の編集"
@@ -23648,10 +24462,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr "ライン参照"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "送電塔"
@@ -23662,23 +24476,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "送電塔の編集"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr "送電塔"
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr "電柱"
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr "塔の参照番号"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "送電線"
@@ -23687,79 +24501,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "送電線の編集"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr "線の種類"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr "線"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr "細い線"
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "電圧"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr "電線の電流量"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr "シングル"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr "ダブル"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr "３"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr "４"
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr "各種設備"
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "トイレ"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr "備考"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "郵便ポスト"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "電話"
@@ -23768,5 +24577,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "電話を編集"
@@ -23774,5 +24583,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "コイン"
@@ -23780,5 +24589,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "備考"
@@ -23786,5 +24595,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr "電子マネー"
@@ -23792,5 +24601,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr "デビットカード"
@@ -23798,15 +24607,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "クレジットカード"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "テレフォンカード"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "リサイクル"
@@ -23815,5 +24624,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "リサイクルステーションの編集"
@@ -23821,63 +24630,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "バッテリー"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "カン"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "被服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "ガラス"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "紙"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "スクラップ金属"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+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:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr "背もたれ"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr "素材"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr "石"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr "プラスチック"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr "色"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr "黒"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr "茶"
@@ -23956,5 +24776,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -23964,31 +24784,31 @@
 msgstr "緑"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr "赤"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr "青"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr "グレー"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr "白"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr "席の数"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr "Hunting Standの編集"
@@ -23997,30 +24817,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "高さ"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr "低い"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr "半分"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr "完全"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr "隠す"
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr "ロック"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "噴水"
@@ -24029,10 +24849,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "噴水の編集"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "飲料水"
@@ -24041,10 +24861,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "飲料水の編集"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr "赤ちゃんポスト"
@@ -24052,15 +24885,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr "赤ちゃんポストの編集"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "店舗"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr ""
@@ -24068,10 +24901,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "自動車パーツショップの編集"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr ""
@@ -24080,28 +24913,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "自転車ショップの編集"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "スーパーマーケット"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "スーパーマーケットの編集"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr "薬品屋"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr "薬品屋の編集"
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr "コンビニエンスストア"
@@ -24109,9 +24942,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr "コンビニの編集"
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "キオスク"
@@ -24119,27 +24952,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "キオスクの編集"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr "本屋"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr "本屋を編集"
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr "旅行代理店"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr "旅行代理店の編集"
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "自動販売機"
@@ -24147,5 +24980,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "自動販売機の編集"
@@ -24153,88 +24986,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "自動販売機"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr "公共_交通_チケット"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr "公共輸送計画"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr "パーキングチケット"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "食料"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "甘味"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "たばこ"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "写真"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "ペットフード"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "新聞"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "おもちゃ"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "切手"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "携帯の契約"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr "プリペイド携帯のチャージ"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr "車"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "コンドーム"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr "タンポン"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr "糞袋"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr "決済または会員用カード"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "精肉店"
@@ -24242,9 +25075,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "精肉店の編集"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "パン屋"
@@ -24252,9 +25085,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "パン屋の編集"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "生花店"
@@ -24262,18 +25095,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "生花店の編集"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr "オーガニック"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr "オーガニック（有機）ショップの編集"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr "酒屋"
@@ -24281,54 +25114,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr "酒屋の編集"
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr "飲料店"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr "酒屋(飲み物屋)の編集"
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr "コンピュータ店"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "コンピュータ店の編集"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr "家電店"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "家電店の編集"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr "オーディオショップ"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr "オーディオショップの編集"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr "家具店"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "家具店の編集"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr "園芸用品店"
@@ -24336,9 +25169,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr "園芸用品店の編集"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr "金物屋"
@@ -24346,9 +25179,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr "金物屋の編集"
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "DIYショップ"
@@ -24356,54 +25189,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "DIYショップの編集"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr "文具店"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr "文具店の編集"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "美容院"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "美容院の編集"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr "靴店"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "靴店の編集"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr "おもちゃ屋"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "おもちゃ屋の編集"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr "ビデオ"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr "ビデオショップの編集"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "クリーニング店"
@@ -24411,9 +25244,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "クリーニング店の編集"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "ランドリー"
@@ -24421,9 +25254,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "ランドリーの編集"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr "アウトドア店"
@@ -24431,28 +25264,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr "アウトドア店の編集"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr "スポーツ店"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr "メガネ屋"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "眼鏡屋の編集"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "お金"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "銀行"
@@ -24460,14 +25293,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "銀行の編集"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "両替"
@@ -24475,5 +25308,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "両替の編集"
@@ -24481,15 +25314,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "ATMの編集"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "医院"
@@ -24497,18 +25330,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "医院の編集"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "歯科医院"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "歯科医院の編集"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "薬局"
@@ -24516,5 +25349,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "薬局の編集"
@@ -24522,9 +25355,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr "調剤薬局"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "病院"
@@ -24532,10 +25365,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "病院の編集"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr "夜間急病センター"
@@ -24544,5 +25377,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr "夜間急病センターの編集"
@@ -24551,20 +25384,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr "ポイント数"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr "ポイント名"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "電話番号"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)"
@@ -24572,5 +25405,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "動物病院"
@@ -24579,64 +25412,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "動物病院の編集"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr "地理学"
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "地名"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "大陸"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "大陸の編集"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "国(country)"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "国(country)の編集"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "州(state)"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "州(state)の編集"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "地方"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "地方の編集"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr "郡"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr "郡の編集"
@@ -24644,15 +25477,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "市区"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "市区の編集"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "町"
@@ -24660,10 +25493,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "町の編集"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "近郊住宅地"
@@ -24671,25 +25504,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "近郊住宅地の編集"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "村"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "村の編集"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "小村落"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "小村落の編集"
@@ -24697,5 +25530,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr "地域"
@@ -24703,10 +25536,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr "地域の編集"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "島"
@@ -24714,10 +25547,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "島の編集"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr "小島"
@@ -24725,5 +25558,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr "小島を編集"
@@ -24731,5 +25564,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "洞窟の入口"
@@ -24737,10 +25570,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "洞窟の入口の編集"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "山頂"
@@ -24748,10 +25581,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "山頂の編集"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "氷河"
@@ -24759,10 +25592,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "氷河の編集"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "火山"
@@ -24770,70 +25603,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "火山の編集"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "境界線"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "国境"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "国境の編集"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "行政区画"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "行政区画の編集"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr "Civil境界"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr "Civil境界の編集"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr "地点名"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "Political境界の編集"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr "国立公園"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "国立公園の境界編集"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "樹木・林"
@@ -24842,15 +25675,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "樹木・林の編集"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "植物の名前"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "森"
@@ -24859,5 +25692,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "森の編集"
@@ -24865,17 +25698,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "針葉樹"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "広葉樹"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "混合林"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "森"
@@ -24884,14 +25717,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "森の編集"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "自然保護区"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "自然保護区の編集"
@@ -24899,25 +25732,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr "ガレ場"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr "ガレ場の編集"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr "低木林"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr "低木林の編集"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr "山(Fell)"
@@ -24925,10 +25758,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr "山(Fell)の編集"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr "荒れ地"
@@ -24936,5 +25769,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "荒れ地の編集"
@@ -24942,5 +25775,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr "農家の庭"
@@ -24949,45 +25782,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr "農家の庭の編集"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "農地"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr "農地の編集"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr "牧草地"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr "牧草地の編集"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "ぶどう園"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "ぶどう園の土地利用の編集"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr "貸し農園"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr "家庭菜園用地の編集"
@@ -24995,25 +25828,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "庭園"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "庭園の編集"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "草地"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr "草地の編集"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr "里山"
@@ -25021,10 +25854,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr "里山利用区画の編集"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr "共有地"
@@ -25032,20 +25865,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr "共有地の名前"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "公園"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "公園の編集"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr "レクレーション広場"
@@ -25053,5 +25886,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr "レクレーション広場利用区画の編集"
@@ -25059,15 +25892,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "住宅エリア"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr "住宅用地の編集"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "墓所"
@@ -25075,9 +25908,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "（教会・寺院にある）墓所の編集"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "共同墓地"
@@ -25085,39 +25918,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "共同墓地の編集"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "小売り商業"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr "小売商用地の編集"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "商用"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr "商用地の編集"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "工業"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr "工業地の編集"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr "鉄道用地"
@@ -25125,15 +25958,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr "鉄道用地の編集"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "軍用"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr "軍用地の編集"
@@ -25141,50 +25974,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "工事中エリア"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "工事中用地の編集"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr "利用されなくなった商業設備"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr "利用されなくなった工業地の編集"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr "未開発工業地"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr "緑地の編集"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr "埋め立てゴミ処理地"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr "埋め立てゴミ処理地の編集"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "採石場"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "採石場の編集"
@@ -25194,5 +26027,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr "マルチポリゴンを編集"
@@ -25201,10 +26034,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr "外側のセグメント"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr "内側のセグメント"
@@ -25212,5 +26045,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr "右左折制限"
@@ -25219,5 +26052,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr "右左折制限の編集"
@@ -25225,34 +26058,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr "通行制限"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr "左折禁止"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr "右折禁止"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr "直進禁止"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr "Uターン禁止"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr "右折のみ"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr "左折のみ"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr "直進のみ"
@@ -25261,15 +26094,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr "ウェイから"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr "ノードかウェイを経由して"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr "ウェイへ"
@@ -25277,5 +26110,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr "ルート"
@@ -25284,5 +26117,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr "ルート編集"
@@ -25290,5 +26123,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr "ルート種類"
@@ -25379,5 +26212,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -25387,17 +26220,17 @@
 msgstr "自転車"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr "バス"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr "道"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr "フェリー"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr "スキー"
@@ -25457,5 +26290,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -25464,9 +26297,9 @@
 msgstr "徒歩"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr "トラム"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr "迂回路"
@@ -25480,10 +26313,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "地下鉄"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr "シンボルの説明"
@@ -25491,31 +26324,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr "ネットワーク"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr "ルート状態"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr "案"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr "代替路"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr "一時的"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr "接続"
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr "色 (16進法)"
@@ -25524,107 +26357,32 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr "ルートセグメント"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr "前のセグメント"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr "後方セグメント"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr "停止点"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr "前方の停止点"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 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"
@@ -26160,77 +26918,4 @@
 msgid "highway_track"
 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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
-msgstr "線路"
 
 #. color rail
@@ -26618,7 +27303,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "バプチスト"
+msgstr ""
 
 #. color manmade
@@ -29757,225 +30441,4 @@
 msgstr ""
 
-#~ msgid ""
-#~ "Failed to add an OAuth authentication header. There is currently no OAuth "
-#~ "Access Token configured."
-#~ msgstr ""
-#~ "OAuth 認証ヘッダのの追加に失敗しました。OAuth 通信トークンは設定していませ"
-#~ "ん。"
-
-#~ msgid "The plugin could not be removed. Probably it was already disabled"
-#~ msgstr "プラグインは削除できませんでした。おそらく既に無効化されています"
-
-#~ msgid "Bridleway"
-#~ msgstr "馬道"
-
-#~ msgid "Cycleway"
-#~ msgstr "自転車道"
-
-#~ msgid "Footway"
-#~ msgstr "遊歩道"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "トラック グレード 1"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "トラック グレード 1　の編集"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "トラック グレード 2"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "トラック グレード 2の編集"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "トラック グレード 3"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "トラック グレード 3　の編集"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "トラック グレード 4"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "トラック グレード 4　の編集"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "トラック グレード 5"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "トラック グレード 5 の編集"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "ハイキングの編集"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "山岳ハイキング"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "山岳ハイキングの編集"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "厳しい山岳ハイキングの編集"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "高山ハイキングの編集"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "厳しい高山ハイキングの編集"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "困難な高山ハイキングの編集"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "ID > 0 が必須です。入力値 {0}"
-
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "パラメータの ''{0}'' はヌルではいけません"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "パラメータ ''{0}'' はヌルであってはなりません。"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr ""
-#~ "OSMデータレイヤーかGPXレイヤーのインスタンスが予期されています。 入力値: "
-#~ "''{0}''。"
-
-#~ msgid ""
-#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
-#~ "This can lead to nodes being deleted accidentally.\n"
-#~ "Are you really sure to continue?"
-#~ msgstr ""
-#~ "選択されたウェイにはダウンロードされたデータ領域の外側にノードがありま"
-#~ "す。\n"
-#~ "これはノードを誤って削除する可能性があります。\n"
-#~ "本当に続けますか？"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "コマンド ''{0}'' をアンドゥできません。なぜならレイヤ ''{1}'' はもうないか"
-#~ "らです。"
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "パラメータ ''{0}'' は空ではダメです"
-
-#~ msgid "Expected array of length 4, got {0}"
-#~ msgstr "長さ4の配列が期待されています、入力値{0}"
-
-#~ msgid "Illegal double value ''{0}''"
-#~ msgstr "不正なダブル値 ''{0}''"
-
-#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
-#~ msgstr "パラメータ ''{0}'' > 0.0 が期待されています。入力値 {1}"
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "ID >= 0 である必要があります。 {0} を受け取りました"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
-#~ msgstr "パラメータ ''{0}'' >= 0 が期待されています、入力値 {1}"
-
-#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-#~ msgstr ""
-#~ "パラメータ ''{0}'' は正しいタイプ名ではありません、 ''{1}'' を受け取りまし"
-#~ "た"
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr ""
-#~ "パラメータ ''{0}'' は受け入れ可能なクラスではありません、 ''{1}'' を受け取"
-#~ "りました"
-
-#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
-#~ msgstr "パラメータ ''{0}'' > 0 が期待されています。入力値 {1}"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr ""
-#~ "パラメータ {0} は 0..{1} の範囲内である必要があります、 {2} を受け取りまし"
-#~ "た"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "パラメータ {0} > 0 が必須です。 {1} を受け取りました。"
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "現在のパラメータは範囲外です: {0} を受け取りました"
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "予期せぬカラムインデックス。入力値: {0}"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr ""
-#~ "パラメータ 'col' は0 または 1でなければなりません。{0} を受け取りました"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "パラメータ ''{0}'' は空以外でなければなりません"
-
-#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
-#~ msgstr ""
-#~ "タグのパラメーター ''{0}'' は、厳格に1つのキーであることが期待されていま"
-#~ "す。 {1} を受けとりました。"
-
-#~ msgid "Dialog not created yet. Invoke createInstance() first"
-#~ msgstr ""
-#~ "ダイアログはまだ作成されていません。最初に createInstance() を呼び出してく"
-#~ "ださい"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Open"
-#~ msgstr "開く"
-
-#~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
-#~ msgstr ""
-#~ "パラメータ ''{0}'' には整数値 > 0 が期待されています、入力値 ''{1}''"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "データ内の競合"
-
-#~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
-#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
-#~ "the new role?</html>"
-#~ msgstr ""
-#~ "<html>空のロールを {0} プリミティブにセットしようとしています。<br>これは"
-#~ "ロールを削除することになります。<br>新しいロールを本当に適用しますか？</"
-#~ "html>"
-
-#~ msgid "Value of child.getId() > 0 expected. Got {1}."
-#~ msgstr "child.getId() の値 > 0 であるべきです。入力値: {1}。"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
-#~ msgstr "パラメータ ''{0}'' > 0 が期待されています。入力値 {1}."
-
-#~ msgid "id in parameter ''{0}'' > 0 expected, got {1}."
-#~ msgstr "パラメータ ''{0}'' 中のID > 0 が期待されています、入力値 {1}."
-
-#~ msgid "Object id > 0 expected. Got {0}"
-#~ msgstr "オブジェクト ID > 0 が期待されています。入力値: {0}"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "画像"
-
-#~ msgid "Illegal value for attribute ''uid''. Got ''{0}''."
-#~ msgstr "属性 ''uid'' に不正な値。入力値: ''{0}''"
-
-#~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-#~ msgstr "OsmDataLayerのインスタンスであるべきです。 入力値: ''{0}''。"
-
-#~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "ID パラメータ ''{0}'' > 0 必須です。 {1} を受け取りました"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-#~ msgstr "パラメータ ''{0}'' >= 0 であるべきです。 {1} を受け取りました"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr ""
-#~ "プラグイン {0} を使うには JOSMをバージョン {1} にアップデートする必要があ"
-#~ "ります。"
-
-#~ msgid "<html>"
-#~ msgstr "<html>"
-
 #~ msgid "Move"
 #~ msgstr "移動"
@@ -30172,4 +30635,8 @@
 #~ msgid "timezone difference: "
 #~ msgstr "タイムゾーンの違い: "
+
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "画像"
 
 #~ msgid "{0} within the track."
@@ -30331,7 +30798,4 @@
 #~ msgstr "GPXトラックが読み込まれました"
 
-#~ msgid "Public"
-#~ msgstr "公開"
-
 #~ msgid "Show Author Panel"
 #~ msgstr "作者パネルを表示"
@@ -30372,4 +30836,10 @@
 #~ msgid "Oberpfalz Geofabrik.de"
 #~ msgstr "Oberpfalz Geofabrik.de"
+
+#~ msgid "Motorboat"
+#~ msgstr "モーターボート"
+
+#~ msgid "Boat"
+#~ msgstr "ボート"
 
 # http://en.wikipedia.org/wiki/Draw_bridge
@@ -30380,7 +30850,4 @@
 #~ msgid "Portcullis"
 #~ msgstr "城の格子戸"
-
-#~ msgid "Station"
-#~ msgstr "駅"
 
 #~ msgid "Shop"
@@ -30430,7 +30897,4 @@
 #~ msgstr "ファイル \"{0}\"中の日付が取得できません。"
 
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "入力した時刻は、解釈できません"
-
 #~ msgid "Tagging preset source"
 #~ msgstr "事前に設定した情報源をタグ付け"
@@ -30469,6 +30933,9 @@
 #~ msgstr "コピーする列を選択してください。"
 
-#~ msgid "board"
-#~ msgstr "board"
+#~ msgid "Bridleway"
+#~ msgstr "馬道"
+
+#~ msgid "Cycleway"
+#~ msgstr "自転車道"
 
 #~ msgid "NullPointerException, possibly some missing tags."
@@ -30614,4 +31081,7 @@
 #~ "ワードは使用しないでください。</b></html>"
 
+#~ msgid "Mountain Hiking"
+#~ msgstr "山岳ハイキング"
+
 #~ msgid ""
 #~ "Zoom: Mousewheel or double click.   Move map: Hold right mousebutton and "
@@ -30711,7 +31181,4 @@
 #~ "してください。"
 
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "ほぼ垂直になっているウェイを選択してください。"
-
 #~ msgid ""
 #~ "Please select at least one node, way or relation. Only already uploaded "
@@ -30736,7 +31203,4 @@
 #~ msgstr "OSMにアップロード"
 
-#~ msgid "Interpolation"
-#~ msgstr "補間"
-
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "マルチポリゴン用の外側のウェイが ''{0}'' にありません。"
@@ -30782,4 +31246,22 @@
 #~ msgstr "デフォルトの値"
 
+#~ msgid "Edit Demanding Alpine Hiking"
+#~ msgstr "厳しい高山ハイキングの編集"
+
+#~ msgid "Edit Demanding Mountain Hiking"
+#~ msgstr "厳しい山岳ハイキングの編集"
+
+#~ msgid "Edit Alpine Hiking"
+#~ msgstr "高山ハイキングの編集"
+
+#~ msgid "Edit Hiking"
+#~ msgstr "ハイキングの編集"
+
+#~ msgid "Edit Mountain Hiking"
+#~ msgstr "山岳ハイキングの編集"
+
+#~ msgid "Edit Difficult Alpine Hiking"
+#~ msgstr "困難な高山ハイキングの編集"
+
 #~ msgid "Edit Information Office"
 #~ msgstr "案内所の編集"
@@ -30787,4 +31269,34 @@
 #~ msgid "Remove route nodes"
 #~ msgstr "ルートノードの削除"
+
+#~ msgid "Edit Track of grade 2"
+#~ msgstr "トラック グレード 2の編集"
+
+#~ msgid "Edit Track of grade 3"
+#~ msgstr "トラック グレード 3　の編集"
+
+#~ msgid "Edit Track of grade 4"
+#~ msgstr "トラック グレード 4　の編集"
+
+#~ msgid "Edit Track of grade 5"
+#~ msgstr "トラック グレード 5 の編集"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "トラック グレード 3"
+
+#~ msgid "Track Grade 5"
+#~ msgstr "トラック グレード 5"
+
+#~ msgid "Track Grade 4"
+#~ msgstr "トラック グレード 4"
+
+#~ msgid "Track Grade 2"
+#~ msgstr "トラック グレード 2"
+
+#~ msgid "Track Grade 1"
+#~ msgstr "トラック グレード 1"
+
+#~ msgid "Edit Track of grade 1"
+#~ msgstr "トラック グレード 1　の編集"
 
 #~ msgid "Edit Portcullis"
@@ -30862,4 +31374,9 @@
 #~ "ジオタグを関連づけします。"
 
+#~ msgid "Plugin {0} requires JOSM update to version {1}."
+#~ msgstr ""
+#~ "プラグイン {0} を使うには JOSMをバージョン {1} にアップデートする必要があ"
+#~ "ります。"
+
 #~ msgid ""
 #~ "(You can change the number of days after which this warning appears<br>by "
@@ -31015,4 +31532,21 @@
 #~ msgstr "パラメータ '{0}' はヌル以外でなければなりません"
 
+#~ msgid "Dialog not created yet. Invoke createInstance() first"
+#~ msgstr ""
+#~ "ダイアログはまだ作成されていません。最初に createInstance() を呼び出してく"
+#~ "ださい"
+
+#~ msgid "Conflicts in data"
+#~ msgstr "データ内の競合"
+
+#~ msgid ""
+#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
+#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
+#~ "the new role?</html>"
+#~ msgstr ""
+#~ "<html>空のロールを {0} プリミティブにセットしようとしています。<br>これは"
+#~ "ロールを削除することになります。<br>新しいロールを本当に適用しますか？</"
+#~ "html>"
+
 #~ msgid "Linked"
 #~ msgstr "リンク済み"
@@ -31036,4 +31570,7 @@
 #~ msgstr ""
 #~ "{0} という名前のプラグインは利用できません。更新はスキップされました。"
+
+#~ msgid "The plugin could not be removed. Probably it was already disabled"
+#~ msgstr "プラグインは削除できませんでした。おそらく既に無効化されています"
 
 #~ msgid ""
@@ -31086,6 +31623,19 @@
 #~ msgstr "必要な属性 ''{0}'' がありません"
 
+#~ msgid ""
+#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
+#~ "This can lead to nodes being deleted accidentally.\n"
+#~ "Are you really sure to continue?"
+#~ msgstr ""
+#~ "選択されたウェイにはダウンロードされたデータ領域の外側にノードがありま"
+#~ "す。\n"
+#~ "これはノードを誤って削除する可能性があります。\n"
+#~ "本当に続けますか？"
+
 #~ msgid "Replace"
 #~ msgstr "置換"
+
+#~ msgid ">"
+#~ msgstr ">"
 
 #~ msgid ""
@@ -31128,4 +31678,7 @@
 #~ msgstr "現在の変更セットはヌルです。データをアップロードできません。"
 
+#~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+#~ msgstr "OsmDataLayerのインスタンスであるべきです。 入力値: ''{0}''。"
+
 #~ msgid "Error: failed to add authentication credentials to the connection."
 #~ msgstr "エラー: 接続する認証信任状の追加に失敗。"
@@ -31138,7 +31691,26 @@
 #~ "ン0.6 にフォールバックします。"
 
+#~ msgid "<html>"
+#~ msgstr "<html>"
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "予期せぬ値が返って来ました。 {0} を受けとりました。"
 
+#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "パラメータ {0} > 0 が必須です。 {1} を受け取りました。"
+
+#~ msgid "Expected ID >= 0. Got {0}."
+#~ msgstr "ID >= 0 である必要があります。 {0} を受け取りました"
+
+#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
+#~ msgstr ""
+#~ "パラメータ ''{0}'' は正しいタイプ名ではありません、 ''{1}'' を受け取りまし"
+#~ "た"
+
+#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
+#~ msgstr ""
+#~ "パラメータ ''{0}'' は受け入れ可能なクラスではありません、 ''{1}'' を受け取"
+#~ "りました"
+
 #~ msgid "There's no primitive with version {0} in this history."
 #~ msgstr "この履歴にはバージョン {0} のプリミティブはありません"
@@ -31147,4 +31719,9 @@
 #~ msgstr "履歴の日付 ''{0}'' には有効なバージョンはありません"
 
+#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
+#~ msgstr ""
+#~ "パラメータ {0} は 0..{1} の範囲内である必要があります、 {2} を受け取りまし"
+#~ "た"
+
 #~ msgid "No earliest version found. History is empty."
 #~ msgstr "前のバージョンがありません。履歴は空です。"
@@ -31153,4 +31730,19 @@
 #~ msgstr "最新のバージョンがありません。履歴は空です。"
 
+#~ msgid "Parameter current out of range. Got {0}."
+#~ msgstr "現在のパラメータは範囲外です: {0} を受け取りました"
+
+#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
+#~ msgstr ""
+#~ "パラメータ 'col' は0 または 1でなければなりません。{0} を受け取りました"
+
+#~ msgid "Parameter ''{0}'' must not be empty."
+#~ msgstr "パラメータ ''{0}'' は空以外でなければなりません"
+
+#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
+#~ msgstr ""
+#~ "タグのパラメーター ''{0}'' は、厳格に1つのキーであることが期待されていま"
+#~ "す。 {1} を受けとりました。"
+
 #~ msgid "Index out of bounds. Got {0}."
 #~ msgstr "範囲外のインデックス。{0} を受け取りました"
@@ -31161,4 +31753,7 @@
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "\"{0}\"を読み込めません。"
+
+#~ msgid "Illegal value for attribute ''uid''. Got ''{0}''."
+#~ msgstr "属性 ''uid'' に不正な値。入力値: ''{0}''"
 
 #~ msgid ""
@@ -31170,4 +31765,13 @@
 #~ "''{1}''."
 #~ msgstr "int 型(>=0)の必須属性 {0} に不正な値、 ''{1}'' を受け取りました"
+
+#~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "ID パラメータ ''{0}'' > 0 必須です。 {1} を受け取りました"
+
+#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
+#~ msgstr "パラメータ ''{0}'' >= 0 であるべきです。 {1} を受け取りました"
+
+#~ msgid "Value of child.getId() > 0 expected. Got {1}."
+#~ msgstr "child.getId() の値 > 0 であるべきです。入力値: {1}。"
 
 #~ msgid ""
@@ -31182,4 +31786,7 @@
 #~ msgid "Preset group ''{0}'' of group ''{1}''"
 #~ msgstr "プリセットのグループ ''{1}'' のグループ ''{0}''"
+
+#~ msgid "Unexpected column index. Got {0}."
+#~ msgstr "予期せぬカラムインデックス。入力値: {0}"
 
 #~ msgid ""
@@ -31286,4 +31893,21 @@
 #~ msgstr "リレーション中の全ての不完全なウェイとノードをダウンロード"
 
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr ""
+#~ "OSMデータレイヤーかGPXレイヤーのインスタンスが予期されています。 入力値: "
+#~ "''{0}''。"
+
+#~ msgid ""
+#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
+#~ msgstr ""
+#~ "コマンド ''{0}'' をアンドゥできません。なぜならレイヤ ''{1}'' はもうないか"
+#~ "らです。"
+
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "パラメータの ''{0}'' はヌルではいけません"
+
+#~ msgid "Footway"
+#~ msgstr "遊歩道"
+
 #~ msgid "No type found. History is empty."
 #~ msgstr "種別が見つかりません。履歴は空です。"
@@ -31301,7 +31925,13 @@
 #~ msgstr "OSMから参照をダウンロードします..."
 
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "パラメータ ''{0}'' はヌルであってはなりません。"
+
 #~ msgid "Can only edit help pages from JOSM Online Help"
 #~ msgstr "JOSMオンラインヘルプからのみヘルプページを編集できます。"
 
+#~ msgid "Object id > 0 expected. Got {0}"
+#~ msgstr "オブジェクト ID > 0 が期待されています。入力値: {0}"
+
 #~ msgid "Failed to read command. Exiting help browser. Exception was:"
 #~ msgstr "コマンド読込に失敗しました。ヘルプブラウザを終了中。例外コード:"
@@ -31309,4 +31939,13 @@
 #~ msgid "Failed to launch the external help browser"
 #~ msgstr "外部ヘルプブラウザの起動に失敗"
+
+#~ msgid "Id > 0 required, got {0}"
+#~ msgstr "ID > 0 が必須です。入力値 {0}"
+
+#~ msgid "Parameter ''{0}'' must not be empty"
+#~ msgstr "パラメータ ''{0}'' は空ではダメです"
+
+#~ msgid "Illegal double value ''{0}''"
+#~ msgstr "不正なダブル値 ''{0}''"
 
 #~ msgid "null detected in node list"
@@ -31321,4 +31960,7 @@
 #~ msgstr "同じuidで異なる名前のユーザが見つかりました"
 
+#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
+#~ msgstr "パラメータ ''{0}'' > 0 が期待されています。入力値 {1}"
+
 #~ msgid "Could not create a node with the entered latitude/longitude."
 #~ msgstr "入力された緯度/経度のノードを作成できませんでした。"
@@ -31326,4 +31968,7 @@
 #~ msgid "Illegal lat/lon value"
 #~ msgstr "不正な緯度/経度の値"
+
+#~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
+#~ msgstr "パラメータ ''{0}'' > 0 が期待されています。入力値 {1}."
 
 #~ msgid "Looking up available translations..."
@@ -31337,7 +31982,34 @@
 #~ msgstr "JOSMを再起動してください。"
 
+#~ msgid "Expected array of length 4, got {0}"
+#~ msgstr "長さ4の配列が期待されています、入力値{0}"
+
+#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+#~ msgstr "パラメータ ''{0}'' > 0.0 が期待されています。入力値 {1}"
+
 #~ msgid "Failed to load load resource ''{0}''. Error is {1}"
 #~ msgstr "リソース ''{0}''のロードに失敗しました。エラー内容 {1}"
 
+#~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
+#~ msgstr "パラメータ ''{0}'' >= 0 が期待されています、入力値 {1}"
+
+#~ msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+#~ msgstr "パラメータ ''{0}'' 中のID > 0 が期待されています、入力値 {1}."
+
 #~ msgid "All installed plugins are up to date."
 #~ msgstr "インストールされているプラグインは全て最新です。"
+
+#~ msgid ""
+#~ "Failed to add an OAuth authentication header. There is currently no OAuth "
+#~ "Access Token configured."
+#~ msgstr ""
+#~ "OAuth 認証ヘッダのの追加に失敗しました。OAuth 通信トークンは設定していませ"
+#~ "ん。"
+
+#~ msgctxt "changeset.open"
+#~ msgid "Open"
+#~ msgstr "開く"
+
+#~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
+#~ msgstr ""
+#~ "パラメータ ''{0}'' には整数値 > 0 が期待されています、入力値 ''{1}''"
Index: applications/editors/josm/i18n/po/nb.po
===================================================================
--- applications/editors/josm/i18n/po/nb.po	(revision 19689)
+++ applications/editors/josm/i18n/po/nb.po	(revision 19698)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 23:20-0500\n"
-"PO-Revision-Date: 2010-01-18 11:12-0500\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-23 21:14+0000\n"
 "Last-Translator: Tor Christian Tovslid <tctovsli@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-01-13 18:28+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -70,11 +70,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -237,5 +237,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -249,13 +249,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -264,5 +264,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -288,5 +291,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Flett"
@@ -315,5 +318,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -380,9 +383,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -390,5 +393,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "OK"
@@ -439,6 +444,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -456,5 +461,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -463,11 +468,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -504,5 +509,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "konflikt"
@@ -635,14 +640,14 @@
 msgstr "Velg minst to linjer å sammenføye."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Kopier"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Kopier valgte objekter til utklippstavla."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Velg noe å kopiere."
@@ -675,8 +680,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -685,5 +690,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -740,16 +745,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Det oppstod {0} konflikter under import."
-msgstr[1] "Det oppstod {0} konflikter under import."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "Konflikter under nedlasting"
-msgstr[1] "Konflikter under nedlasting"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -770,4 +774,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -777,4 +783,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Fordoble utvalget ved å kopiere og umiddelbart lime inn."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Fordoble linje"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "Flytt valgte medlem opp"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "Lag: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "Gå til {0}"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr ""
 
 #. <button label="Info" hotkey="I">
@@ -865,10 +899,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 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] "Valgt linje inneholder ikke valgt node."
-msgstr[1] "Valgt linje inneholder ikke de valgte nodene."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -989,5 +1022,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "URL"
@@ -1137,5 +1170,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr ""
 
@@ -1149,9 +1182,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Åpner filer"
-msgstr[1] "Åpner filer"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1207,7 +1240,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1221,5 +1254,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "Flytt noder så alle vinkler blir 90 eller 270 grader"
 
@@ -1253,4 +1287,8 @@
 "undesirable results when doing rectangular alignments.<br>Change your "
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+msgid "Selection must consist only of ways and nodes."
 msgstr ""
 
@@ -1267,4 +1305,15 @@
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr "Velg linjer med tilnærmet vinkelrette knekk for vinkling."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1370,18 +1419,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1406,12 +1455,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Feil"
@@ -1544,5 +1594,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1737,9 +1787,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "Kopier {0} noder til {1} noder"
-msgstr[1] "Kopier {0} noder til {1} noder"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1783,5 +1833,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr "Last ned data"
@@ -2204,6 +2254,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2284,7 +2334,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
-#, fuzzy
 msgid "<not>"
-msgstr "nord"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
@@ -2326,5 +2375,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Søk etter objekt."
@@ -2510,5 +2559,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Søk"
@@ -2548,25 +2597,22 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "CS"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
-msgstr "CI"
+msgstr ""
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
-msgstr "RX"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2579,10 +2625,10 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 "Nøkkel kan ikke være tom når egenskap-operatoren brukes. Bruk: nøkkel=verdi"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2604,7 +2650,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
-msgstr "Uventet symbol: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
@@ -2717,9 +2763,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "Endre {0} objekt"
-msgstr[1] "Endre {0} objekt"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2769,12 +2815,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "Fjern «{0}» i {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Sett {0}={1} i {2} {3}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2834,17 +2880,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Slettemodus"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Valgt spor: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Slett fra relasjon"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2925,9 +2971,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "Endre {0} objekt"
-msgstr[1] "Endre {0} objekt"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -2977,24 +3023,24 @@
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "Undelete {0} primitive"
 msgid_plural "Undelete {0} primitives"
-msgstr[0] "Gjenopprett {0} objekter"
-msgstr[1] "Gjenopprett {0} objekter"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for node {0}"
-msgstr "Løs koordinatkonflikter i {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for way {0}"
-msgstr "Løs koordinatkonflikter i {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Løs medlemskonflikter i relasjon {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3096,11 +3142,9 @@
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
 "not a directory."
 msgstr ""
-"Klarte ikke sette referanse. Referanse-ID {0} er ikke tilgjengelig i "
-"historikken."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
@@ -3243,5 +3287,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3249,5 +3293,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3255,5 +3299,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3261,5 +3305,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3338,15 +3382,13 @@
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "CS"
+msgstr ""
 
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
-#, fuzzy
 msgctxt "filter"
 msgid "I"
-msgstr "CI"
+msgstr ""
 
 #. column header: filter mode
@@ -3359,8 +3401,7 @@
 #. filter mode: replace
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210
-#, fuzzy
 msgctxt "filter"
 msgid "R"
-msgstr "RX"
+msgstr ""
 
 #. filter mode: add
@@ -3382,19 +3423,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3403,5 +3444,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3409,5 +3450,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3530,6 +3571,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3539,5 +3580,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3548,7 +3589,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3570,5 +3611,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "bakgrunn"
@@ -3712,6 +3753,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3719,37 +3760,38 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "uferdig"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "ferdselsvei"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "jernbane"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "vannvei"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "bruk av grunn"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3758,10 +3800,10 @@
 msgstr[1] "{0} noder"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3770,5 +3812,5 @@
 msgstr[1] "{0} medlemmer"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3805,6 +3847,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Konflikt"
@@ -3815,7 +3857,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-#, fuzzy
-msgid "Authorization Failed"
-msgstr "Tilkobling mislykkes"
+msgid "Authorisation Failed"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
@@ -4018,5 +4059,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Klargjør"
@@ -4057,5 +4097,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4066,5 +4106,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Endre"
@@ -4135,29 +4175,29 @@
 msgstr "målestokk"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Lengdegrad ved musepekeren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The name of the object at the mouse pointer."
 msgstr "Navn på objekt ved musepeker"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Breddegrad ved musepekeren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 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:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Kompassretning på segmentet som tegnes."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 msgid "The length of the new way segment being drawn."
 msgstr "Lengden på segmentet som tegnes."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4165,9 +4205,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(intet objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4328,16 +4368,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Egenskaper ({0} konflikter)"
-msgstr[1] "Egenskaper ({0} konflikter)"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "{0} pending tag conflict to be resolved"
 msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} gjenværende egenskapskonflikter å løse"
-msgstr[1] "{0} gjenværende egenskapskonflikter å løse"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
@@ -4396,16 +4436,16 @@
 msgstr "Konfliktløsning"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr "Liste i rolle {0} er for øyeblikket ikke med i et sammenlikningspar."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "Uventet verdi for parameter «index». Leste {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4623,7 +4663,12 @@
 msgstr "Node"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4651,5 +4696,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional node used by way {1}<br>which is deleted on the "
@@ -4659,9 +4704,5 @@
 "server.<br><br>Do you want to undelete these nodes too?"
 msgstr[0] ""
-"<html>Ytterligere {0} noder i bruk av linje {1},<br>er slettet på tjeneren."
-"<br><br>Vil du gjenopprette også disse nodene?</html>"
 msgstr[1] ""
-"<html>Ytterligere {0} noder i bruk av linje {1},<br>er slettet på tjeneren."
-"<br><br>Vil du gjenopprette også disse nodene?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
@@ -4670,5 +4711,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional primitive referred to by relation {1}<br>which is "
@@ -4678,9 +4719,5 @@
 "deleted on the server.<br><br>Do you want to undelete these too?"
 msgstr[0] ""
-"<html>Ytterligere {0} objekter med henvisninger i relasjon {1},<br>er "
-"slettet på tjeneren.<br><br>Vil du gjenopprette også dem?</html>"
 msgstr[1] ""
-"<html>Ytterligere {0} objekter med henvisninger i relasjon {1},<br>er "
-"slettet på tjeneren.<br><br>Vil du gjenopprette også dem?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
@@ -4783,5 +4820,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr "Nei, avbryt"
@@ -4829,5 +4866,10 @@
 msgstr "Objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr "Sammenslåtte noder er ikke låst ennå. Kan ikke lage løsningskommando."
@@ -4957,10 +4999,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "ingen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "alle"
@@ -4990,7 +5032,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-#, fuzzy, java-format
+#, java-format
 msgid "Tag collection does not include the selected value ''{0}''."
-msgstr "Valgt linje inneholder ikke valgt node."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
@@ -5040,7 +5082,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -5050,6 +5092,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5229,10 +5271,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5252,18 +5294,18 @@
 msgstr "Kommandoliste: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Løs"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr "Åpne en dialog for å sammenføye element i lista ovenfor."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5295,8 +5337,9 @@
 msgid ""
 "<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions won't be applied unless all differences<br>are "
-"resolved.Click <strong>{0}</strong> to close anyway."
-"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<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 ""
 
@@ -5319,5 +5362,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5326,5 +5369,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5404,43 +5447,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 msgid "Open a list of all loaded layers."
 msgstr "Liste over alle innleste lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Vis/Skjul"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Fordoble linje"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 msgid "Move the selected layer one row up."
 msgstr "Flytt laget en rad opp."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Flytt laget en rad ned."
@@ -5454,6 +5502,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Relasjoner"
@@ -5463,69 +5511,69 @@
 msgstr "Åpne en liste over alle relasjoner"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relasjoner: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Åpne en editor for den valgte relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Slet valgt relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Oprett ny relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Aktuelt utvalg"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Åpne vindu med en utvalgsliste"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Zoom til valgt(e) element"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Zoom til utvalg"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Valgt: Rel.:{0} / Linjer:{1} / Noder:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5533,5 +5581,5 @@
 msgstr "Utvalg"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5882,8 +5930,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -5955,4 +6001,7 @@
 #. <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 />
@@ -6031,6 +6080,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6072,6 +6122,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6540,152 +6592,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Navn"
@@ -7068,5 +7122,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<different>"
@@ -7121,55 +7175,55 @@
 msgstr "Tilføy egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaper: {0} / Medlemskap: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Egenskaper / Medlemskap"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Skift relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "Slett fra relasjon"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Vil du slette utvalget fra relasjon {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Fjern den valgte nøkkel i alle objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "DSlett egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Tilføy et nytt nøkkel/verdi-sett til alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Rett verdien for den valgte nøkkel for alle objekter"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7496,7 +7550,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
-#, fuzzy
 msgid "Do you really want to apply the new role?"
-msgstr "Vil du tillate dette?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
@@ -7591,8 +7644,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr "Advarsel: ignorerer unntak siden handling ble avbrutt. Unntak: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
@@ -7612,47 +7665,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Bokmerker"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../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:187
+#: ../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:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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:212
+#: ../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:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr ""
@@ -7690,7 +7742,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
-#, fuzzy, java-format
+#, java-format
 msgid "The string ''{0}'' is not a valid double value."
-msgstr "parameter «{0}» er ikke et gyldig typenavn – leste «{1}»"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
@@ -7776,18 +7828,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -7798,34 +7850,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
 msgid "Enter a place name to search for:"
 msgstr "Gi et stednavn å søke etter:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+#: ../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:147
+#: ../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:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Null pointer-feil, muligens manglende egenskaper."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr ""
@@ -7836,7 +7888,9 @@
 #. 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" />
@@ -7845,10 +7899,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Type"
@@ -7857,5 +7912,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -7867,17 +7922,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "ukjent"
@@ -8233,5 +8287,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr "Konflikter avdekkeet"
@@ -8676,9 +8730,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8688,7 +8742,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -8700,16 +8754,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "Lag"
@@ -9122,68 +9176,68 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "gps-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Tilpass linjetegning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../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:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Tilpass farge"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Velg en farge"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr "Markører fra navngitte punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Navngivne sporpunkt fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Importer lyd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9193,23 +9247,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-lydfiler (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Lyd-markører fra {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Importer bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9219,5 +9273,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9225,5 +9279,5 @@
 msgstr "Navn: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9231,5 +9285,5 @@
 msgstr "Beskrivelse: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9239,23 +9293,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Lengde: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9264,5 +9318,5 @@
 msgstr[1] "{0} ruter, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9271,10 +9325,10 @@
 msgstr[1] "{0} waypoints"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Konverter til datalag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9284,43 +9338,43 @@
 "skadeligt <br>Se her for å laste inn GPS spor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Konvertert fra: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "Last ned fra OSM langs dette spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Last ned alt innenfor:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "Max areal per forespørsel:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9331,9 +9385,9 @@
 "Ønsker du<br>å fortsette?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 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:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9343,5 +9397,5 @@
 "ble utelatt eller flyttet til start."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9351,23 +9405,23 @@
 "utelatt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datalag {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "utenfor nedlastet område"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr "versjon {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 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:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9376,5 +9430,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9388,5 +9442,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9399,11 +9453,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9412,32 +9466,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} består av:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr "ikke satt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr "API versjon: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Konvertér til GPX-lag"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9484,28 +9538,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "GPS-punkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX Filer (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, 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:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Feil oppsto ved sending av {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Klarte ikke lese «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9516,34 +9569,34 @@
 "<br>Skriv inn tidspunktet og velg tidssone<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr "Tidspunkt for foto (fra EXIF):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 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:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr "Jeg er i tidssonen: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "Ingen dato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr "Åpne et annet foto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 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:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9553,64 +9606,64 @@
 "Sjekk format"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "Ugyldig dato"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr "<Ingen GPX-spor er lastet inn>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr "GPX-spor: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr "Åpne flere GPX-spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr "Tidssone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr "Forskyvning:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9620,45 +9673,45 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr "Jevnfør bilder med GPX spor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr "Jevnfør"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr "Ugyldig tidssone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr "Ugyldig forskyvning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Tidssone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minutter: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekunder: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9667,5 +9720,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9675,21 +9728,21 @@
 "synkronisere bildene manuelt."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr "Klarte ikke å koble foto til sporet"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr "Juster tidssone og forskyvning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 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:951
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr "Foto har ikke tidskode."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -9697,17 +9750,17 @@
 msgstr "Valgte GPX spor mangler tidskode. Velg et annet spor."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr "GPX sporet har ikke tidskoder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 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:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr "Intgen GPX-spor er valgt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9718,5 +9771,5 @@
 "Forventet format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9727,75 +9780,75 @@
 "Forventet format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "Leser GPS posisjoner fra EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr "Starter scanning av mapper"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "Les bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Leser {0} …"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, 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:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Scanner mappa {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, 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:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, 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:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Geotaggede bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr "Juster til GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "Ingen data lastet inn."
-msgstr[1] "Ingen data lastet inn."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
+#, java-format
 msgid "{0} was found to be GPS tagged."
 msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] "{0} hadde gps posisjon."
-msgstr[1] "{0} hadde gps posisjon."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -9804,5 +9857,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -9899,5 +9952,5 @@
 msgstr "GPS-flagg"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -9905,5 +9958,5 @@
 msgstr[1] "flagg"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -9912,29 +9965,29 @@
 msgstr[1] "{0} består av {1} flagg"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "Synkroniser lyd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 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:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr "Lyd synkronisert i punkt {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr "Sett audio-merke ved avspilnings-start"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -9942,17 +9995,17 @@
 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:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 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:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Vis/skjul tekst/ikoner"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 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:171
+#: ../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 "
@@ -9962,5 +10015,5 @@
 "(etter første markør)."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -9970,5 +10023,5 @@
 "i track for synkronisering."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "Kan ikke sette ny audio-markør"
@@ -9994,5 +10047,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
 #, java-format
 msgid ""
@@ -10000,5 +10053,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
 #, java-format
 msgid ""
@@ -10050,8 +10103,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize URL:"
-msgstr "Opphavsmann"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10141,8 +10192,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize now"
-msgstr "Opphavsmann"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10201,7 +10250,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
-#, fuzzy
 msgid "OAuth authorization failed"
-msgstr "Tilkobling mislykkes"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
@@ -10281,8 +10329,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
-#| msgid "Please select at least four nodes."
 msgid "Please select an authorization procedure: "
-msgstr "Velg minst fire noder."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10292,8 +10338,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
-#, fuzzy
-#| msgid "Close dialog and cancel downloading"
 msgid "Close the dialog and cancel authorization"
-msgstr "Steng dialog og avbryt nedlasting"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
@@ -10608,5 +10652,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Velg raden som skal endres"
@@ -10620,5 +10664,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10767,9 +10811,4 @@
 msgstr "Tegnestil {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "Lag: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -10799,6 +10838,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr "Alle"
@@ -10837,8 +10876,8 @@
 msgstr "En farge (kan tilpasses navngitte lag)"
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Bil"
@@ -10860,13 +10899,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Sykkel"
@@ -10899,12 +10938,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "Til fots"
@@ -11252,5 +11291,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
-#, fuzzy
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11266,14 +11304,4 @@
 "keyboard...</p>"
 msgstr ""
-"<p>Du vil finne ut at lista med hutigtaster inneholder taster fra alle "
-"tastatur som Java kjenner, og ikke bare taster på ditt tastatur. Bruk bare "
-"de tastene som faktisk eksisterer på ditt tastatur. Dersom ditt tastatur "
-"ikke har en 'Copy' tast (PC tastatur har ikke disse, men de finnes på "
-"tastatur fra Sun), bruk ikke dennet. Det vil også være taster som stemmer "
-"med hurtigtaster på ditt tastatur (som f. eks. ':'/kolon). Bruk ikke disse "
-"heller. Bruk hovedverdien for slike taster (';'/Semikolon på US tastatur, "
-"'.'/Komma på Norsk tatstatur , ...) i stedet. Det skaper konflikter dersom "
-"du ikke passer på dette. JOSM kan ikke vite om Ctrl+Shift+; og Ctrl+: "
-"faktisk er den samme tasten på amerikanske eller norske tastatur...</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
@@ -11891,5 +11919,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -11897,18 +11932,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "Valgfrie attributter:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr "stengt_vei"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Ukjent type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -11919,16 +11954,16 @@
 msgstr "Klarte ikke å lese egenskapslista for Objektmaler: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Feil ved lesing av {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Element type {0} kan brukes."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -11937,18 +11972,17 @@
 msgstr[1] "Endre {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "Intet er valgt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "Utvalget passer ikke formålet!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "Bruk Objektmal"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Endre egenskaper"
@@ -12005,11 +12039,9 @@
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
 "capabilities. Got ''{2}''"
 msgstr ""
-"ugyldig verdi for obligatorisk attributt «{0}» av type «OsmPrimitiveType» – "
-"leste «{1}»"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
@@ -12226,6 +12258,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12250,9 +12282,9 @@
 msgstr "Klarte ikke lese fil «{0}»"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Lesefeil: Strukturen i GPX fila er ukjent"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12268,7 +12300,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
-#, fuzzy
 msgid "Looking for image files"
-msgstr "Søker etter kystlinje …"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
@@ -12276,14 +12307,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#, fuzzy, java-format
+#, java-format
 msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
-"Lokalt datasett har ikke noe element med ID {0}. Elementtype er ukjent."
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308
@@ -12351,5 +12387,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "Importerte koordinater: "
@@ -12450,9 +12486,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Endre {0} objekt"
-msgstr[1] "Endre {0} objekt"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -13085,5 +13121,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -13092,7 +13128,5 @@
 "are:"
 msgstr[0] ""
-"Programtillegget {1} er avhengig av programtillegg  {0} men ble ikke funnet."
 msgstr[1] ""
-"Programtillegget {1} er avhengig av programtillegg  {0} men ble ikke funnet."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13260,7 +13294,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:69
-#, fuzzy, java-format
+#, java-format
 msgid "The plugin file ''{0}'' does not include a Manifest."
-msgstr "Fila «{0}» finnes ikke"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:181
@@ -13357,5 +13391,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13363,8 +13396,4 @@
 "file a bug report."
 msgstr ""
-"En uventet unntakstilstand opstod.\n"
-"\n"
-"Dette er altid en programmeringsfeil. Hvis du bruker siste\n"
-"versjon av JOSM, setter vi pris på en feilrapport."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13458,6 +13487,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -13573,6 +13602,6 @@
 msgstr "Fant ikke oversettelsen for {0}. Bruker {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13581,5 +13610,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -13729,4 +13758,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr ""
@@ -13817,5 +13847,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "Interpoler adresser"
@@ -14411,5 +14441,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr "Område"
@@ -14573,21 +14603,21 @@
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr "TangoGPS-filer (*.log)"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr "Formatfeil: "
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr "TangoGPS-data importert"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr "Klarte ikke importere TangoGPS-data."
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr "TCX filer (*.tcx)"
@@ -14619,9 +14649,9 @@
 msgstr "Opprett kopi av linje"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr "Lag for redigering av GPX-spor"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Konverter til GPX lag med anonymisert tid"
@@ -14636,13 +14666,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr "Importer spor fra GPX lag"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr "Slett eksisterende sti"
@@ -14651,6 +14681,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr "Fant ikke GPX lag"
@@ -14879,17 +14909,17 @@
 msgstr "Last inn bildesett som et nyt lag."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr "Retningsindex '{0}' ble ikke funnet"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr "Startposisjon var ikke innenfor avgrensingen"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:105
 msgid "Looking for shoreline..."
 msgstr "Søker etter kystlinje …"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -14933,42 +14963,41 @@
 msgstr "Fjerner doble noder …"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr "Lakewalker tegning"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr "Det oppstod en ukjent feil"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "øst"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "nordøst"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "nord"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "nordvest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "vest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "sørvest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "sør"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "sørøst"
@@ -15024,6 +15053,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -15032,74 +15061,74 @@
 msgstr "vann"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "kystlinje"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "land"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Maximum number of segments per way"
 msgstr "Maksimalt antall segmenter per linje"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
 msgid "Maximum number of nodes in initial trace"
 msgstr "Maksimalt antall noder i første opptegning"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Max gråverdi for tolking som vann (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
 msgid "Line simplification accuracy (degrees)"
 msgstr "Nøyaktighetsgrense for forenkling av linje (grader)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Oppløsning på Landsat kartbilder (pixler pr grad)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Størrelsen på Landsat kartbilder (pixels)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
 msgid "Shift all traces to east (degrees)"
 msgstr "Flytt alle spor mot øst (grader)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
 msgid "Shift all traces to north (degrees)"
 msgstr "Flytt alle spor mot nord (grader)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
 msgid "Direction to search for land"
 msgstr "Retning for søk etter land"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
 msgid "Tag ways as"
 msgstr "Egenskap for linjer"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr "WMS Lag"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr "Max størrelse på mellomlager (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
 msgid "Maximum cache age (days)"
 msgstr "Max alder på mellomlager (dager)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:68
 msgid "Source text"
 msgstr "Beskrivelse av kilde"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Maksimalt antall segmenter tillatt i hver opptegnede linje. Standard er 250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -15108,5 +15137,5 @@
 "Max antall Noder som genereres (før linjer forenkles).Standard er 50000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -15116,5 +15145,5 @@
 "Kan være 0-255. Standard 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -15124,5 +15153,5 @@
 "verdier gir flere noder og mer nøyaktige linjer. Standard er 0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -15131,21 +15160,21 @@
 "4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Størrelsen på Landsat bilder i pixler. Standard: 2000"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Parallellflytt alle punkt mot øst (Grader).  Standard: 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Parallellflytt alle punkt mot nord (Grader).  Standard: 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Direction to search for land. Default east."
 msgstr "Retning for søk etter land. Standard: øst."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
@@ -15153,33 +15182,33 @@
 "water."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "Hvilket WMS lag danner bakgrunn for vektorisering. Standard: IR1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "Max størrelse på hver mappe for mellomlager i bytes. Standard: 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr "Max alder for hver fil i mellomlager i dager. Standard: 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr "Beskrivelse av datakilde. Standard: Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "Et tilleggsprogram for å vektorisere vannkant på Landsat bilder."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr "Innstillinger for Lakewalker tilleggsprogram"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:50
 msgid "Downloading image tile..."
 msgstr "Laster ned bildefil …"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr "Kunne ikke hente bilde"
@@ -15203,5 +15232,5 @@
 msgstr "Tilkobling mislykkes"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr ""
@@ -15232,5 +15261,5 @@
 msgstr "Kurs"
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr "LiveGPS-lag"
@@ -15304,5 +15333,5 @@
 msgstr "Vinkel mellom to valgte Noder"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr "Målelag"
@@ -15570,4 +15599,76 @@
 msgid "Firefox executable"
 msgstr "Firefox-programfil"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#, fuzzy
+msgid "Read error!"
+msgstr "Drikkevannskilde"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Angi koordinatene for den nye noden."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Behold sikkerhetskopier"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Feil"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "Den indtastede tid kunne ikke tolkes"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Gi nytt navn på fil også"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Behold sikkerhetskopier"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "Behold sikkerhetskopier"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Skriv over"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+#, fuzzy
+msgid "Could not delete temporary file!"
+msgstr "Kunne ikke finne element-typen"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
@@ -15843,6 +15944,6 @@
 msgstr "Lagre til fil hvert minutt."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -15968,72 +16069,129 @@
 msgstr "Du må først oppgi kilde for objektmaler."
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+#, fuzzy
+msgid "Terrace a house"
+msgstr "Terasseinndeling av hus (og rekkehus)"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+msgid "Interpolation"
+msgstr "Interpolasjon"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Veier"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Høyseste nummer"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Laveste nummer"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+#, fuzzy
+msgid "Lowest housenumber of the terraced house"
+msgstr "Reverser hus nummer på terassehus."
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Oprett ny relasjon"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Opprett kopi av linje"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Gatenavn"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr "Laveste nummer"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr "Høyseste nummer"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr "Reverser terasseinndeling"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr "Reverser hus nummer på terassehus."
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr "Reverser Terasseinndeling"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:83
+msgid "Cannot reverse!"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:125
 msgid "Reverse Terrace"
 msgstr "Reverser Terasseinndeling"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr "Terasseinndeling av hus (og rekkehus)"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr "Del opp lang bygning i separate hus."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr "Velg én enkel lukket linje med minst fire noder."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr "Terasse"
@@ -16269,5 +16427,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr "Dobbelt-Noder"
@@ -16277,5 +16435,5 @@
 msgstr "Denne testen sjekker at det ikke er flere Noder med samme posisjon."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16287,9 +16445,9 @@
 "nå) .<br>Er du sikker på at du vil slette nodene?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr ""
@@ -16324,5 +16482,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -16471,7 +16629,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr "Ulovlige kombinasjoner Egenskap / Verdi"
@@ -16479,80 +16637,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr "Problem med visning"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Nøkkel «{0}» er ugyldig."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr "Egenskaper uten verdier"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr "Ulovlig egenskapsnøkkel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr "Ulovlig mellomrom i Nøkkel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr "Egenskap Verdi starter eller slutter med mellomrom"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr "Egenskap Verdi inneholder HTML koding"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Nøkkel «{0}» finnes ikke i objektmalene"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr "Objektmalene inneholder ikke Nøkkelen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Verdi «{0}» for nøkkel «{1}» finnes ikke i objektmalene"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr "Objektmalen har ikke Egenskapsverdi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr "FIXMEs"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr "Sjekk egenskabsnøkler"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Bekreft at egenskabsnøklene kan sjekkes mot en ordliste."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr "Bruk avansert egenskapskontroll."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr "Kontroller egenskapsverdiene med hjelp av avanserte regler."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr "Egenskapskontroll-kilde"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16562,86 +16720,86 @@
 "org/index.php/User:JLS/speller) eller \"tag checking data files\"."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr "Tilføy en ny kilde til lista."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr "Rediger valgt kilde."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "Slett den valgte kilden fra lista."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "Datakilder"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr "Sjekk egenskapsverdier."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr "Bekreft at du vil sjekke egenskapsverdiene imot Objektmalene."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr "Se etter FIXMEs"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Søker etter noder eller linjer med FIXME i en egenskapsverdi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr "Finn notater om tegning."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr "Sjekk etter feil ved opptegning."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr "Bruk standard datafil."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr "Bruk standard datafil (anbefales)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr "Bruk standard fil for stavekontroll."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Brug standard fil for stavekontroll (anbefales)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr "Korriger egenskaper"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr "Kunne ikke finne element-typen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr "Kunne ikke finne advarsels-niveå"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Ugyldig uttrykk «{0}»"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -17083,5 +17241,5 @@
 msgstr "WMS lag ({0})  laster ned i zoom {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -17092,63 +17250,63 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+msgid "Download visible tiles"
+msgstr "Last ned synlige kartbilder"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
 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:309
-msgid "Download visible tiles"
-msgstr "Last ned synlige kartbilder"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "Bytt oppløsning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr "Last ned kartbilder med feil på nytt"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr "Alpha channel"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "Lagre WMS lag til fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr "Lagre WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "les inn WMS lag fra fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr "Last inn WMS-lag"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, 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:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr "Feil Fil Format"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "Feil ved lasting av fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -17421,6 +17579,13 @@
 msgstr "Starter visning av SVG bilde av aktuelt skjermutsnitt i FireFox."
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17431,15 +17596,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "JGoodies Plastic Look and Feel."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr "La andre program sende kommandoer til JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17450,10 +17615,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr "Gir deg Ruteplanlegger på OSM data."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17464,15 +17629,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Legger inn markører eller Noder på gps posisjon."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Dialog for å redigere egenskaper i en tabell."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17485,10 +17650,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr "Lager rekkehus / terassehus fra en enkel husblokk."
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17499,5 +17664,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17506,10 +17671,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Last enkelt ned data langs strekninger av sammenknyttede veier."
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -17616,6 +17781,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -17623,6 +17797,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "Veinummer"
@@ -17639,5 +17814,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Kjørebaner"
@@ -17659,10 +17834,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Hastighetsbegrensning (km/t)"
@@ -17706,14 +17881,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "Enveiskjøring"
@@ -17756,13 +17931,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -17800,13 +17975,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -17841,13 +18016,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "Skjæring"
@@ -17882,13 +18057,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "Øy"
@@ -18020,4 +18195,13 @@
 msgid "Edit Unclassified Road"
 msgstr "Rediger småvei"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr ""
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -18035,15 +18219,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr "Bredde ( meter)"
@@ -18055,5 +18239,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Boligfeltvei"
@@ -18062,5 +18246,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "Rediger boligfeltvei"
@@ -18078,16 +18262,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Veidekke"
@@ -18109,166 +18296,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr "fast dekke"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr "uten fast dekke"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr "betong"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "skogsområde"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr "brostein"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "grus"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "gress"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "sand"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr "jord"
@@ -18276,5 +18470,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr "Gatetun"
@@ -18283,5 +18477,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr "Rediger gatetun"
@@ -18289,5 +18483,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "Gågate"
@@ -18296,5 +18490,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "Rediger gågate"
@@ -18302,5 +18496,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr "oppkjørsel"
@@ -18309,5 +18503,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr "Rediger oppkjørsel"
@@ -18317,18 +18511,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr "Type adkomstvei"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr "Smug"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr "Oppkjørsel"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr "parking_aisle"
@@ -18336,5 +18530,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr "Parkeringsvei"
@@ -18344,5 +18538,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr "Rediger parkeringsvei"
@@ -18350,5 +18544,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "Vei (ukjent type)"
@@ -18357,5 +18551,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "Rediger vei av ukjent type"
@@ -18364,20 +18558,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "Restriksjoner"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "Rediger restriksjioner"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "Avgift"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "Ingen gjennomkjøring"
@@ -18385,9 +18579,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 msgid "Access"
 msgstr "Adkomst"
 
 #. 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"
@@ -18398,6 +18593,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18409,4 +18602,5 @@
 #. 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"
@@ -18425,141 +18619,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+msgid "yes"
+msgstr "ja"
+
+#. 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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "privat"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+msgstr "brukertype"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:219
+msgid "destination"
+msgstr "destinasjon"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr "permissive"
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr "Skog- og Landbruk"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-msgid "yes"
-msgstr "ja"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "privat"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-msgstr "brukertype"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "destinasjon"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr "permissive"
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr "Skog- og Landbruk"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "nei"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr "Varer"
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Tung last (hgv)"
@@ -18574,10 +18776,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr "Hest"
@@ -18593,10 +18795,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "Motorsykkel"
@@ -18611,27 +18813,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr "Motorkjøretøy"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr "Offentlige Tjenestekjøretøy (psv)"
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr "Motorbåt"
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "Båt"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Min. hastighet (km/t)"
@@ -18639,25 +18833,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "maks totalvekt"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr "Max. Høyde (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr "Max. Bredde (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr "Max. Lengde (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "Rundkjøring"
@@ -18668,5 +18862,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "Rediger kryss"
@@ -18686,10 +18880,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "motorway"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr "motorway_link"
@@ -18711,10 +18905,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "trunk"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr "trunk_link"
@@ -18736,10 +18930,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "riksvei"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr "tilkjørselsvei_riksvei"
@@ -18761,5 +18955,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -18774,9 +18968,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "kommunevei"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr "småvei"
@@ -18790,9 +18984,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "boligvei"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr "gatetun"
@@ -18822,10 +19016,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "adkomstvei"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr "trikkespor"
@@ -18855,5 +19049,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -18865,10 +19059,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Rediger bro"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr "Rediger tunnel"
@@ -18876,19 +19070,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Gater"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "Veiarbeid"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "Rediger vei under bygging"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "Kryss"
@@ -18904,5 +19098,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "rundkjøring"
@@ -18910,5 +19104,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr "Traktorvei"
@@ -18917,40 +19111,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr "Rediger traktorvei"
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "Traktorvei"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "grus"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "grus"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "grus"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "grus"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "grus"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr ""
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -18958,5 +19146,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -18964,37 +19152,32 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr "tur"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "Fjellsti"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
-msgstr "Krevende fjellsti"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
-msgstr "Alpin fjellsti"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
-msgstr "Krevende alpin fjellsti"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
-msgstr "Vanskelig alpin fjellsti"
+msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "Sti"
@@ -19003,12 +19186,32 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "Rediger sti"
 
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr "middels"
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
+
 #: build/trans_presets.java:489
-#, fuzzy
 msgid "Wheelchairs"
-msgstr "Rullestol"
+msgstr ""
 
 #: build/trans_presets.java:490
@@ -19024,7 +19227,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "Rediger ridevei"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -19037,7 +19239,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "Rediger sykkelvei"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -19072,24 +19273,21 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "Sammenføy uansett"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "Rediger gangvei"
+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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Rediger gangvei"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr ""
@@ -19097,5 +19295,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "Trapper"
@@ -19105,5 +19303,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Rediger trapper"
@@ -19111,10 +19309,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr "Veipunkt"
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "Motorveikryss"
@@ -19122,15 +19320,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "Rediger motorveikryss"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "Service"
@@ -19138,5 +19336,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr "Rediger Serviceområde"
@@ -19144,5 +19342,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -19175,17 +19374,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "Operatør"
@@ -19194,5 +19393,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "Trafikklys"
@@ -19202,5 +19401,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr "Type gangfelt"
@@ -19209,27 +19408,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr "ukontrollert"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr "trafikklys"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "trafikkøy"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr "umerket"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr "Kryssende ridevei"
@@ -19237,6 +19436,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr "Kryssende sykkelvei"
@@ -19245,11 +19444,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr "Betjent fotgjengerfelt"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr "Crossing type name (UK)"
@@ -19257,30 +19456,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr "pelican"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "Full stopp"
@@ -19288,5 +19487,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr "Fotgjengerfelt"
@@ -19295,14 +19494,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr "Rediger fotgjengerfelt"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr "Type name (UK)"
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr "Mini-rundkjøring"
@@ -19313,14 +19558,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr "Retning"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr "med_klokka"
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr "Vendesirkel"
@@ -19330,26 +19575,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "Bygrense"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "Rediger bygrenseskilt"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr "Annet navn"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 msgid "Speed Camera"
 msgstr "Fotoboks"
 
 #. 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "Nødtelefon"
@@ -19357,5 +19604,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr "Stigning"
@@ -19363,5 +19610,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr "Sterk stigning"
@@ -19369,11 +19616,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr "Vadested"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr "Rediger vadested"
@@ -19381,5 +19635,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr "Fjellpass"
@@ -19387,5 +19641,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr "Rediger fjellpass"
@@ -19397,7 +19651,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "Høyde"
@@ -19405,5 +19659,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Stengsel"
@@ -19411,5 +19665,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr "Sperresøyle"
@@ -19417,5 +19671,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr "Rediger sperresøyle"
@@ -19460,16 +19714,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "Tillatt trafikk:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr "Halvbommer"
@@ -19478,5 +19732,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr "Steinblokk"
@@ -19484,5 +19738,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr "Ferist"
@@ -19490,10 +19744,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr "Rediger ferist"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr "Bussluse"
@@ -19501,15 +19755,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr "Pigghinder"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr "Rediger pigghinder"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "Bomstasjon"
@@ -19517,5 +19771,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "Rediger bomstasjon"
@@ -19523,10 +19777,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr "Tollstasjon"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr "Rediger tollstasjon"
@@ -19536,5 +19790,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr "Hekk"
@@ -19543,12 +19797,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:817 build/trans_presets.java:819
 msgid "Fence"
 msgstr "Gjerde"
 
-#. item "Barriers/Fence"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "Mur"
@@ -19556,5 +19822,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "Bymur"
@@ -19563,5 +19829,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr "Støttemur"
@@ -19573,15 +19839,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr "Inngang"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr "Rediger inngang"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "Port"
@@ -19589,50 +19856,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr "Rediger port"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr "Veibom"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr "Rediger veibom"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr "Gjerdestengsel"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr "Rediger gjerdestengsel"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr "Støtfangergjerde"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr "Rediger støtfangergjerde"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr "Fotgjengerport"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr "Rediger fotgjengerport"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr "Gjerdetrapp"
@@ -19640,25 +19907,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr "Rediger gjerdetrapp"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr "Sortiport"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr "Rediger sortiport"
@@ -19669,11 +19936,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "Vann"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "Vannkilde"
@@ -19681,5 +19948,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "Rediger vannkilde"
@@ -19687,5 +19954,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr "Drenering"
@@ -19693,10 +19960,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr "Rediger drenering"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "Bekk"
@@ -19704,10 +19982,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "Rediger bekk"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "Kanal"
@@ -19715,10 +19993,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "Rediger kanal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "Elv"
@@ -19728,5 +20006,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "Rediger elv"
@@ -19734,15 +20012,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Rediger vann"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "Rediger land"
@@ -19750,15 +20028,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr "Basseng"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr "Rediger basseng"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr "Drikkevannskilde"
@@ -19766,15 +20044,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr "Rediger drikkevannskilde"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr "Tildekt drikkevannskilde"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr "Rediger tildekt drikkevannskilde"
@@ -19782,5 +20060,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "Elvebredd"
@@ -19789,10 +20067,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "Rediger elvebredd"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr "Våtmarksområde"
@@ -19803,14 +20081,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr "Rediger våtmarksområde"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "Sumpområde"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr "Flytemyr"
@@ -19824,35 +20102,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr "Myrområde"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr "Sivområde"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr "Saltmyr"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr "Tidevannsflate"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr "Mangrove"
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "Gjørme"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr "Rediger gjørme"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "Strand"
@@ -19860,20 +20138,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "Rediger strand"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "Havbukt"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "Rediger havbukt"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "Klippe"
@@ -19881,10 +20159,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "Rediger klippe"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "Kystlinje"
@@ -19892,5 +20170,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "Rediger kystlinje"
@@ -19898,5 +20176,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "Fergerute"
@@ -19904,5 +20182,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr "Rediger fergerute"
@@ -19911,5 +20189,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr "Skipsverft"
@@ -19917,10 +20195,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr "Rediger skipsverft"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "Tørrdokk"
@@ -19928,5 +20206,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr "Rediger tørrdokk"
@@ -19934,5 +20212,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "Demning"
@@ -19940,15 +20218,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "Rediger demning"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr "Punkt i vann"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr "Sluseport"
@@ -19957,5 +20235,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr "Terskeldam"
@@ -19963,20 +20241,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr "Rediger terskeldam"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "Foss"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "Rediger foss"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr "Snuplass"
@@ -19985,15 +20263,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr "Marina"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr "Rediger marina"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "Brygge"
@@ -20001,10 +20279,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "Rediger brygge"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr "Fergeleie"
@@ -20012,10 +20290,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr "Rediger fergeleie"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr "Båtslipp"
@@ -20025,20 +20303,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr "Rediger båtslipp"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "Jernbane"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "Jernbane"
@@ -20046,5 +20324,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr "Rediger jernbane"
@@ -20053,139 +20331,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr "standard"
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr "Stasjonsområde"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr "Sidespor"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr "Privat sidespor"
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr "jernbane"
+
+#. 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:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+msgid "Voltage"
+msgstr "Spenning"
+
+#. 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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr "Smal jernbane"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr "Rediger smal jernbane"
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr "Monorail"
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr "Rediger Monorail"
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr "Fredet bane"
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr "Rediger fredet bane"
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr "Bybane"
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr "Rediger bybane"
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "T-bane"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "Rediger T-bane"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "Trikk"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr "Rediger trikk"
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr "Busspor"
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr "Rediger busspor"
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "Nedlagt jernbane"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "Rediger nedlagt jernbane"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr "Alternative typer"
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr "Stasjonsområde"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr "Sidespor"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr "Privat sidespor"
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr "Smal jernbane"
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr "Rediger smal jernbane"
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr "Monorail"
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr "Rediger Monorail"
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr "Fredet bane"
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr "Rediger fredet bane"
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr "Bybane"
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr "Rediger bybane"
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "T-bane"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "Rediger T-bane"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "Trikk"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr "Rediger trikk"
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr "Busspor"
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr "Rediger busspor"
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "Nedlagt jernbane"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "Rediger nedlagt jernbane"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "Revet jernbane"
@@ -20194,5 +20711,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr "Planovergang"
@@ -20201,5 +20718,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr "Fotgjengerfelt"
@@ -20209,5 +20726,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr "Type fotgjengerfelt"
@@ -20215,5 +20732,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "Dreieskive"
@@ -20222,10 +20739,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr "Taubaner og -heiser"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "Stolheis"
@@ -20233,10 +20757,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr "Rediger stolheis"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr "T-krokheis"
@@ -20244,10 +20768,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr "Rediger T-krokheis"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "Taubane"
@@ -20255,10 +20779,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "Rediger taubane"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr "Gondolbane"
@@ -20266,10 +20790,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr "Rediger gondolbane"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20277,12 +20801,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr ""
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "Bensinstasjon"
@@ -20292,9 +20829,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Rediger bensinstasjon"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20348,32 +20942,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "Åpningstider"
@@ -20432,94 +21026,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20531,5 +21201,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20539,5 +21209,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Rediger parkering"
@@ -20548,25 +21218,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr "Referansenummer"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "P-hus"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "Overflateparkering"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr "P-kjeller"
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr ""
@@ -20575,48 +21245,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "Gebyr"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr "Handicap-plasser"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "Bilvask"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "Rediger bilvask"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "Verksted"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "Rediger verksted"
@@ -20624,5 +21294,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "Bilutleie"
@@ -20631,10 +21301,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "Rediger bilutleie"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr "Bildeling"
@@ -20642,5 +21312,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr "Rediger bildeling"
@@ -20648,10 +21318,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "Rediger sykkelparkering"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr "Kapasitet"
@@ -20660,15 +21330,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "Rediger sykkelutleie"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Offentlig transport"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -20678,5 +21348,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -20684,5 +21354,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr "Internasjonal UIC-jernbanekode"
@@ -20690,5 +21360,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr "Jernbanestopp"
@@ -20696,5 +21366,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr "Rediger jernbanestopp"
@@ -20702,5 +21372,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "Trikkestopp"
@@ -20709,5 +21379,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "Rediger trikkestopp"
@@ -20715,5 +21385,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "Jernbaneplattform"
@@ -20722,5 +21392,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "Rediger jernbaneplattform"
@@ -20732,5 +21402,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr "Spornummer"
@@ -20738,10 +21408,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr "Område"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "T-baneinngang"
@@ -20750,10 +21420,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "Rediger T-baneinngang"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr "Rullestol"
@@ -20762,5 +21432,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "Busstasjon"
@@ -20769,5 +21439,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "Rediger busstasjon"
@@ -20775,5 +21445,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "Bussholdeplass"
@@ -20783,5 +21453,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "Rediger bussholdeplass"
@@ -20790,25 +21460,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr "Leskur / Ly for natten"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "Benk"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr "Bussplatform"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr "Rediger bussplattform"
@@ -20816,5 +21487,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "Taxi"
@@ -20822,5 +21493,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "Rediger taxi-stasjon"
@@ -20828,32 +21499,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "Flyplass"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr "Rediger flyplass"
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr "IATA"
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr "ICAO"
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+msgid "Beacon"
+msgstr "Fyrlykt"
+
+#. 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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Overnatting"
@@ -20865,5 +21631,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotell"
@@ -20872,15 +21638,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "Rediger hotell"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "Stjerner"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr "Motell"
@@ -20888,20 +21654,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr "Rediger motell"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr "Gjestehus"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr "Rediger gjestehus"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "Feriehytter"
@@ -20909,10 +21675,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr "Rediger feriehytter"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr "Ungdomsherberge"
@@ -20920,30 +21686,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr "Rediger ungdomsherberge"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr "Fjellstue"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr "Rediger fjellstue"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr "Campingvognplass"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr "Rediger campingvognplass"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "Campingplass"
@@ -20951,10 +21717,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr "Rediger campingplass"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Mat og drikke"
@@ -20965,5 +21731,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -20971,5 +21737,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "Rediger restaurant"
@@ -20977,5 +21743,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr "Kjøkken"
@@ -20983,61 +21749,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "italiensk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "kinesisk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "gatekjøkken"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "gresk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "tysk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "indisk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "lokal"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "tyrkisk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "asiatisk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "meksikansk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "japansk"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "Gatekjøkken"
@@ -21045,9 +21823,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "Rediger gatekjøkken"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "Kafé"
@@ -21055,9 +21841,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "Rediger kafé"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "Pub"
@@ -21065,18 +21851,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "Rediger pub"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr "Rediger Biergarten"
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr "Bar"
@@ -21084,9 +21870,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr "Rediger bar"
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "Nattklubb"
@@ -21094,24 +21880,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "Rediger nattklubb"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Turisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr "Attraksjon"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr "Rediger attraksjon"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Museum"
@@ -21119,9 +21905,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Rediger museum"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Zoologisk hage"
@@ -21130,9 +21916,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Rediger  zoologisk hage"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "Utsiktspunkt"
@@ -21140,24 +21926,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "Rediger utsiktspunkt"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr "Utsiktstårn"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "Temapark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr "Rediger temapark"
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "Kunstverk"
@@ -21165,5 +21951,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "Rediger kunstverk"
@@ -21171,19 +21957,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr "Turistinformasjon"
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Kart"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr ""
@@ -21221,5 +22007,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -21227,28 +22013,28 @@
 msgstr "gate"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr "Nærmere forklaring"
@@ -21258,5 +22044,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr ""
@@ -21264,5 +22050,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr "Tursti"
@@ -21270,6 +22056,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "Sykling"
@@ -21277,5 +22063,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr ""
@@ -21283,6 +22069,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "Ski"
@@ -21290,5 +22076,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr ""
@@ -21296,46 +22082,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr "Informasjonstavle"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "historisk"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr "natur"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr "dyreliv"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr ""
@@ -21343,29 +22129,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr "Annen informasjon"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr "Rediger ly for natten"
@@ -21373,25 +22159,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr "Bålplass"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "Piknik-sted"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "Rediger piknik-sted"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Historiske steder"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Slott"
@@ -21400,19 +22186,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Rediger slott"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Rediger ruiner"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Arkeologisk plass"
@@ -21421,9 +22207,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "Rediger arkeologisk plass"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "Slagmark"
@@ -21431,10 +22217,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "Rediger slagmark"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr ""
@@ -21442,5 +22228,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -21448,15 +22234,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "Rediger monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "Minneplatte"
@@ -21464,55 +22250,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "Rediger minneplatte"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr "Kors i veikant"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr "Rediger kors i veikant"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr "Veialter"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr "Rediger veialter"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Fritid"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "Badepark"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "Rediger badepark"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Lekeplass"
@@ -21520,35 +22306,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Rediger lekeplass"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Fiskeplass"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "Rediger fiskeplass"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr "Sport"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Rediger stadion"
@@ -21562,6 +22348,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "velg sport:"
@@ -21953,6 +22739,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -21986,225 +22772,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr "flerbruk"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "bueskyting"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr "turn"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "australsk fotball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr "bowls"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "klatring"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr "cricketnett"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr "krocket"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "sykling"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr "hundeløp"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr "ridning"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "gymnastikk"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "ishockey"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr "hesteløp"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr "motorsport"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "skyting"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr "skøyter"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "ski"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "fotball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "svømming"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "Sportssenter"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "Rediger sportssenter"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr "Bane"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr "Rediger bane"
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr "Racerbane"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr "Rediger racerbane"
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "Golfbane"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "Rediger golfbane"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "Rediger minigolf"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr "Flerbruk"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr "Rediger flerbruk"
@@ -22243,21 +23029,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "type"
@@ -22296,203 +23082,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr "bane"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "sportssenter"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr "bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr "Rediger bowling"
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr "Turn"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr "Rediger turn"
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "Bueskyting"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "Rediger bueskyting"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "Klatring"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "Rediger klatring"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr "Rediger kano"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr "Rediger sykling"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "Hundeløp"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr "Rediger hundeløp"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr "Ridning"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr "Rediger ridning"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr "Hesteløp"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr "Rediger hesteløp"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "Gymnastikk"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr "Rediger gymnastikk"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr "Rediger motorsport"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr "Skøyter"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr "Rediger skøyter"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr "Rediger skateboard"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "Svømming"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "Rediger svømming"
@@ -22500,56 +23286,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr "Rediger ski"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr "Løypetype"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr "slalom"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr "langrenn"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr "snøpark"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr "Vanskelighetsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr "begynner"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr "enkel"
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr "middels"
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr "vanskelig"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr "fristil"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "Skyting"
@@ -22557,182 +23339,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "Rediger skyting"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "Fotball"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr "Rediger fotball"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "Amerikansk fotball"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr "Rediger amerikansk fotball"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr "Australsk fotball"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr "Rediger australsk fotball"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr "Rediger baseball"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "Rediger basketball"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr "Rediger golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "golfbane"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr "Rediger boule"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr "Rediger bowls"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr "Rediger cricket"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr "Cricketnett"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr "Rediger cricketnett"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr "Rediger krocket"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "Ishockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "Rediger ishockey"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr "Rediger pelota"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr "Rediger racquet"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr "Rediger rugby"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "Rediger bordtennis"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "Rediger tennis"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Bygninger"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "Bygning"
@@ -22740,5 +23522,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Offentlig bygning"
@@ -22746,10 +23528,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Rediger offentlig bygning"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "Rådhus"
@@ -22757,10 +23539,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Rediger rådhus"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Ambassade"
@@ -22768,10 +23550,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Rediger ambassade"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "Domstol"
@@ -22780,10 +23562,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Rediger domstol"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Fengsel"
@@ -22792,10 +23574,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Rediger fengsel"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Politi"
@@ -22805,10 +23587,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Rediger politi"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "Brannstasjon"
@@ -22817,10 +23599,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Rediger brannstasjon"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Postkontor"
@@ -22828,5 +23610,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Rediger postkontor"
@@ -22834,15 +23616,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "Barnehage"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "Rediger barnehage"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "Skole"
@@ -22850,10 +23632,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "Rediger skole"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "Universitet"
@@ -22861,10 +23643,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "Rediger universitet"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "Høyskole"
@@ -22872,5 +23654,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "Rediger høyskole"
@@ -22878,5 +23660,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Kino"
@@ -22885,10 +23667,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Rediger kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "Bibliotek"
@@ -22897,9 +23679,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Rediger bibliotek"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "Kunstsenter"
@@ -22907,10 +23689,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "Rediger kunstsenter"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Teater"
@@ -22919,10 +23701,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Rediger teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "Tilbedelsessted"
@@ -22932,5 +23714,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "Rediger tilbedelsessted"
@@ -22939,6 +23721,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "Religion"
@@ -22947,66 +23729,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "kristen"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "jødisk"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr "unitarisk"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr "zoroastrisk"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr "Trosretniing"
@@ -23015,81 +23797,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr "anglikansk"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "katolsk"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr "evangelisk"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr "Jehovas vitner"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "luthersk"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr "metodist"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr "mormoner"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "ortodoks"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr "pinsebevegelsen"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr "presbyteriansk"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Adresser"
@@ -23098,5 +23880,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Rediger adresseinformasjon"
@@ -23104,5 +23886,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "Husnummer"
@@ -23110,25 +23892,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "Husnavn"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Gatenavn"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "By/sted"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "Landskode"
@@ -23137,5 +23919,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "Rediger interpolasjon"
@@ -23143,61 +23925,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr "Nummereringsmåte"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "oddetall"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "partall"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr "alfabetisk"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr "Menneskeskapt"
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "Fabrikk"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "Rediger fabrikk"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Tårn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Rediger tårn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr ""
@@ -23205,25 +23987,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Vanntårn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Rediger vanntårn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "Gassbeholder"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "Rediger gassbeholder"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "Fyrtårn"
@@ -23231,10 +24013,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Rediger fyrtårn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Vindmølle"
@@ -23242,10 +24024,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Rediger vindmølle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Rørledning"
@@ -23254,37 +24036,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Rediger rørledning"
 
-#: build/trans_presets.java:2198
-msgid "oil"
-msgstr ""
-
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
 msgid "gas"
 msgstr "gass"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr ""
+
+#: build/trans_presets.java:2353
+msgid "oil"
+msgstr ""
+
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "Kloakkrenseanlegg"
@@ -23294,10 +24076,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "Rediger kloakkrenseanlegg"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Kran"
@@ -23305,21 +24087,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Rediger kran"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr "Fyrlykt"
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr "Rediger fyrlykt"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "Trigonometrisk punkt"
@@ -23327,10 +24104,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "Rediger trigonometrisk punkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "Overvåkingskamera"
@@ -23338,11 +24115,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Rediger overvåkingskamera"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "Kraftverk"
@@ -23352,35 +24141,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "Rediger kraftverk"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "vind"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "vann"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "atom"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "kull"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr "solcelle"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "Kraftstasjon"
@@ -23389,10 +24178,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "Rediger kraftstasjon"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "Transformatorstasjon"
@@ -23401,5 +24190,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "Rediger transformatorstasjon"
@@ -23407,10 +24196,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr "Linjenummer"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "Kraftmast"
@@ -23421,23 +24210,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "Rediger kraftmast"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "Kraftlinje"
@@ -23446,79 +24235,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "Rediger kraftlinje"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr ""
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "Spenning"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr "Fasiliteter"
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Toaletter"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr "Kommentar"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "Postkasse"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Telefon"
@@ -23527,5 +24311,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Rediger telefon"
@@ -23533,5 +24317,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Mynter"
@@ -23539,5 +24323,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "Sedler"
@@ -23545,5 +24329,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronisk lommebok eller betalingskort"
@@ -23551,5 +24335,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr "Bankkort"
@@ -23557,15 +24341,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Kredittkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Returstasjon"
@@ -23574,5 +24358,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Rediger returstasjon"
@@ -23580,63 +24364,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "Bokser"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "Klær"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "Papir"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "Metall"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+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:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr ""
@@ -23715,5 +24510,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -23723,31 +24518,31 @@
 msgstr "grønn"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr "Jaktpost"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr "Rediger jaktpost"
@@ -23756,30 +24551,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "Høyde"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr "lav"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr "Skjul"
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr "Lås"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "Fontene"
@@ -23788,10 +24583,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "Rediger fontene"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "Drikkevann"
@@ -23800,10 +24595,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Rediger drikkevann"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr "Stellebord"
@@ -23811,15 +24619,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr "Rediger stellebord"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Butikker"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr ""
@@ -23827,10 +24635,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "Rediger bilforretning"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr ""
@@ -23839,28 +24647,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "Rediger sykkelbutikk"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "Supermarked"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "Rediger supermarked"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr "Minimarked"
@@ -23868,9 +24676,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr "Rediger Minimarked"
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -23878,27 +24686,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "Rediger kiosk"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "Automat"
@@ -23906,5 +24714,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "Rediger automat"
@@ -23912,88 +24720,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "Automatprodukter"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr "billetter"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr "buss-, trikk- og togkart"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr "parkeringsbillett"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "mat"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "drikke"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "godter"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "sigaretter"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "foto"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "dyremat"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "aviser"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "leker"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "frimerke"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr "sedler"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr "tamponger"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr "hundeposer"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr "kundekort"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "Slakter"
@@ -24001,9 +24809,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Rediger slakter"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "Baker"
@@ -24011,9 +24819,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Rediger baker"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "Blomster"
@@ -24021,18 +24829,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "Rediger blomster"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr "Økologisk"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr "Rediger økologisk"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr "Sprit og vin"
@@ -24040,54 +24848,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr "Rediger sprit og vin"
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr "Drikke"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr "Rediger drikke"
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr "Dataelektronikk"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "Rediger dataelektronikk"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr "Elektronikk"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "Rediger elektronikk"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr "Rediger hifi"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr "Møbler"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "Rediger møbler"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr "Hagesenter"
@@ -24095,9 +24903,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr "Rediger hagesenter"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr "Jernvarehandel"
@@ -24105,9 +24913,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr "Rediger jernvarehandel"
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "Byggevare"
@@ -24115,54 +24923,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "Rediger byggevare"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr "Kontor"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr "Rediger kontor"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "Frisør"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "Rediger frisør"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr "Sko"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "Rediger sko"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr "Leker"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "Rediger leker"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr "Video"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr "Rediger video"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Renseri"
@@ -24170,9 +24978,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Rediger renseri"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Vaskeri"
@@ -24180,9 +24988,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Rediger vaskeri"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr "Friluftsutstyr"
@@ -24190,28 +24998,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr "Rediger friluftsutstyr"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr "Rediger sport"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr "Optiker"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "Rediger optiker"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Valuta"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Bank"
@@ -24219,14 +25027,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Rediger bank"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "Minibank"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Veksle valuta"
@@ -24234,5 +25042,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Rediger valutaveksling"
@@ -24240,15 +25048,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Rediger minibank"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Helse"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "Lege"
@@ -24256,18 +25064,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "Rediger lege"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "Tannlege"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "Rediger tannlege"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -24275,5 +25083,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Rediger apotek"
@@ -24281,9 +25089,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr "Reseptlevering"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Sykehus"
@@ -24291,10 +25099,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Rediger sykehus"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr "Redningsmøtepunkt"
@@ -24303,5 +25111,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr "Rediger redningsmøtepunkt"
@@ -24310,20 +25118,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr "Navn på punkt"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Bruk internasjonalt nummer, f.eks. +12-345-67890)"
@@ -24331,5 +25139,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "Veterinær"
@@ -24338,64 +25146,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "Rediger veterinær"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Steder"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Rediger kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Rediger land"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "Delstat/provins"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "Rediger delstat/provins"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "Rediger region (fylke)"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr "Kommune"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr "Rediger kommune"
@@ -24403,15 +25211,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "Storby"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "Rediger storby"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "By"
@@ -24419,10 +25227,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "Rediger by"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "Forstad/bydel"
@@ -24430,25 +25238,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "Rediger forstad/bydel"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Landsby"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Rediger landsby"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "Grend"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "Rediger grend"
@@ -24456,5 +25264,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr "Lokalitet"
@@ -24462,10 +25270,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr "Rediger lokalitet"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "Øy"
@@ -24473,10 +25281,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Rediger øy"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr ""
@@ -24484,5 +25292,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr ""
@@ -24490,5 +25298,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "Huleinngang"
@@ -24496,10 +25304,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "Rediger huleinngang"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Fjelltopp"
@@ -24507,10 +25315,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Rediger fjelltopp"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "Isbre"
@@ -24518,10 +25326,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "Rediger isbre"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "Vulkan"
@@ -24529,70 +25337,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "Rediger vulkan"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Grenser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "Nasjonal"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "Rediger landegrense"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "Fylkesgrense"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "Rediger fylkesgrense"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr "Kommunegrense"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr "Rediger kommunegrense"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr "Politisk"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "Rediger politisk grense"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr "Nasjonalpark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "Rediger nasjonalparkgrense"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Bruk av grunn"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Tre"
@@ -24601,15 +25409,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Rediger tre"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "Botanisk navn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "Skogsområde"
@@ -24618,5 +25426,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "Rediger skogsområde"
@@ -24624,17 +25432,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "barskog"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "løvskog"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "blandingsskog"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "Skog"
@@ -24643,14 +25451,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "Rediger skog"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "Rediger naturreservat"
@@ -24658,25 +25466,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr "Steinur"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr "Rediger steinur"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr "Krattskog"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr "Rediger krattskog"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr "Fjell"
@@ -24684,10 +25492,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr "Rediger fjell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr "Beite"
@@ -24695,5 +25503,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "Rediger beite"
@@ -24701,5 +25509,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr "Gårdstun"
@@ -24708,45 +25516,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr "Rediger gårdstun"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "Åkerland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr "Rediger åkerland"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr "Eng"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr "Rediger eng"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "Rediger vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr "Hageparseller"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr "Rediger hageparseller"
@@ -24754,25 +25562,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "Hage"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "Rediger hage"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "Gress"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr "Rediger gress"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr "Friområde"
@@ -24780,10 +25588,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr "Rediger friområde"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr "Offentlig"
@@ -24791,20 +25599,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr "Rediger offentlig"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "Rediger park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr "Friluftsområde"
@@ -24812,5 +25620,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr "Rediger friluftsområde"
@@ -24818,15 +25626,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "Boligområde"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr "Rediger boligområde"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "Gravlund"
@@ -24834,9 +25642,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Rediger gravlund"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -24844,39 +25652,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "Rediger kirkegård"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "Forretninger"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr "Rediger forretninger"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "Næringsområde"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr "Rediger næringsområde"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr "Rediger industriområde"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr "Jernbanegrunn"
@@ -24884,15 +25692,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr "Rediger jernbanegrunn"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "Millitært"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr "Rediger millitært"
@@ -24900,50 +25708,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "Byggeplass"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "Rediger byggeplass"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr "Rivningsområde"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr "Rediger rivningsområde"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr "Byggeområde"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr "Rediger byggeområde"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr "Avfallsdeponi"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr "Rediger avfallsdeponi"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "Steinbrudd"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "Rediger steinbrudd"
@@ -24953,5 +25761,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr "Rediger multipolygon"
@@ -24960,10 +25768,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr "ytre linjesegment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr "indre linjesegment"
@@ -24971,5 +25779,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr "Svingeforbud"
@@ -24978,5 +25786,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr "Rediger svingeforbud"
@@ -24984,34 +25792,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr "Forbud"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr "venstresving forbudt"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr "høyresving forbudt"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr "rett frem forbudt"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr "u-sving forbudt"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr "påbudt høyresving"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr "påbudt venstresving"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr "påbudt rett frem"
@@ -25020,15 +25828,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr "fra linje"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr "via node eller linje"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr "til linje"
@@ -25036,5 +25844,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr "Rute"
@@ -25043,5 +25851,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr "Rediger rute"
@@ -25049,5 +25857,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr "Rutetype"
@@ -25138,5 +25946,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -25146,17 +25954,17 @@
 msgstr "sykkel"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr "vei"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr "ferge"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr "ski"
@@ -25216,5 +26024,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -25223,9 +26031,9 @@
 msgstr "fotgjenger"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr "trikk"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr "omkjøring"
@@ -25239,10 +26047,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "T-bane"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr "Symbolforklaring"
@@ -25250,31 +26058,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr "Nettverk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr "planlagt"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr "alternativ"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr "midlertidig"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr "forbindelse"
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr "Farge (hex)"
@@ -25283,107 +26091,32 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr "rutesegment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr "neste segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr "forrige segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr "stoppepunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr "neste stoppunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 msgid "backward halt point"
 msgstr "forrige stoppunkt"
-
-#. <!--
-#. 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 "standard"
 
 #. mappaint style named "standard"
@@ -25919,77 +26652,4 @@
 msgid "highway_track"
 msgstr "ferdselsvei – traktorvei"
-
-#. 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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
-msgstr "jernbane"
 
 #. color rail
@@ -26377,7 +27037,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "baptist"
+msgstr ""
 
 #. color manmade
@@ -29516,111 +30175,4 @@
 msgstr ""
 
-#~ msgid "Bridleway"
-#~ msgstr "Ridevei"
-
-#~ msgid "Cycleway"
-#~ msgstr "Sykkelvei"
-
-#~ msgid "Footway"
-#~ msgstr "Gangvei"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Traktorvei klasse 1"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Rediger traktorvei klasse 1"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Traktorvei klasse 2"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Rediger traktorvei klasse 2"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Traktorvei klasse 3"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Rediger traktorvei klasse 3"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Traktorvei klasse 4"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Rediger traktorvei klasse 4"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Traktorvei klasse 5"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Rediger traktorvei klasse 5"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Rediger tursti"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Rediger fjellsti"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Rediger krevende fjellsti"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Rediger alpin fjellsti"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Rediger krevende alpin fjellsti"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Rediger vanskelig alpin fjellsti"
-
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "Parameter ''{0}'' kan ikke vœre null"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parameter «{0}» må ha en verdi"
-
-#~ msgid ""
-#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
-#~ "This can lead to nodes being deleted accidentally.\n"
-#~ "Are you really sure to continue?"
-#~ msgstr ""
-#~ "De valgte linjene har noder utenfor nedlastet dataområde.\n"
-#~ "Dette kan medføre at noder blir slettet ved uhell.\n"
-#~ "Er du sikker på at du vil fortsette?"
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "parameter «{0}» er ikke en tillatt klasse – leste «{1}»"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr "parameter «{0}» i intervall 0–{1} forventet – leste {2}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "Parameter «{0}» > 0 forventet – leste «{1}»."
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "parameter «current» utenfor rekkevidde: leste {0}"
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "Uventet kolonneindeks: {0}"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "Parameter «col» må være 0 eller 1. Leste {0}."
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Konflikter i data"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "bilde"
-#~ msgstr[1] "bilder"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-#~ msgstr "parameter «{0}» >= 0 forventet – leste «{1}»"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "Programtillegg {0} krever JOSM-oppdatering til versjon {1}."
-
 #~ msgid "Move"
 #~ msgstr "Flytt"
@@ -29846,4 +30398,9 @@
 #~ msgstr "GPS-slutt: {0}"
 
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "bilde"
+#~ msgstr[1] "bilder"
+
 #~ msgid "timezone difference: "
 #~ msgstr "tidssone-forskjell: "
@@ -29860,7 +30417,4 @@
 #~ msgid "Synchronize Time with GPS Unit"
 #~ msgstr "Synkronisér tidspunkt med GPS-enhet"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Den indtastede tid kunne ikke tolkes"
 
 #~ msgid "Image"
@@ -29915,7 +30469,4 @@
 #~ msgid "Do not show again"
 #~ msgstr "Ikke vis igjen"
-
-#~ msgid "Public"
-#~ msgstr "Offentlig"
 
 #~ msgid "Add a new tagging preset source to the list."
@@ -30140,7 +30691,4 @@
 #~ msgid "Open User Page"
 #~ msgstr "Åpne brukerside"
-
-#~ msgid "Interpolation"
-#~ msgstr "Interpolasjon"
 
 #~ msgid "Optional"
@@ -30265,6 +30813,33 @@
 #~ msgstr "Last inn TCX filer direkte fra JOSM."
 
-#~ msgid "Station"
-#~ msgstr "Stasjon"
+#~ msgid "Boat"
+#~ msgstr "Båt"
+
+#~ msgid "Motorboat"
+#~ msgstr "Motorbåt"
+
+#~ msgid "Bridleway"
+#~ msgstr "Ridevei"
+
+#~ msgid "Cycleway"
+#~ msgstr "Sykkelvei"
+
+#~ msgid "Footway"
+#~ msgstr "Gangvei"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "Traktorvei klasse 3"
+
+#~ msgid "Track Grade 1"
+#~ msgstr "Traktorvei klasse 1"
+
+#~ msgid "Track Grade 2"
+#~ msgstr "Traktorvei klasse 2"
+
+#~ msgid "Track Grade 5"
+#~ msgstr "Traktorvei klasse 5"
+
+#~ msgid "Track Grade 4"
+#~ msgstr "Traktorvei klasse 4"
 
 #~ msgid "Combine ways with different memberships?"
@@ -30278,7 +30853,4 @@
 #~ msgid "All the ways were empty"
 #~ msgstr "Alle linjene var tomme"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Velg linjer med tilnærmet vinkelrette knekk for vinkling."
 
 #~ msgid "Please select one or more closed ways of at least four nodes."
@@ -30325,7 +30897,4 @@
 #~ msgid "bicyclemap"
 #~ msgstr "sykkelkart"
-
-#~ msgid "board"
-#~ msgstr "infotavle"
 
 #~ msgid "Image with path {0} does not exist or is not readable."
@@ -30453,4 +31022,28 @@
 #~ msgstr "Indre linje «{0}» er utenfor."
 
+#~ msgid ""
+#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
+#~ "This can lead to nodes being deleted accidentally.\n"
+#~ "Are you really sure to continue?"
+#~ msgstr ""
+#~ "De valgte linjene har noder utenfor nedlastet dataområde.\n"
+#~ "Dette kan medføre at noder blir slettet ved uhell.\n"
+#~ "Er du sikker på at du vil fortsette?"
+
+#~ msgid "Edit Track of grade 1"
+#~ msgstr "Rediger traktorvei klasse 1"
+
+#~ msgid "Edit Track of grade 2"
+#~ msgstr "Rediger traktorvei klasse 2"
+
+#~ msgid "Edit Track of grade 3"
+#~ msgstr "Rediger traktorvei klasse 3"
+
+#~ msgid "Edit Track of grade 5"
+#~ msgstr "Rediger traktorvei klasse 5"
+
+#~ msgid "Edit Track of grade 4"
+#~ msgstr "Rediger traktorvei klasse 4"
+
 #~ msgid "Update Selection"
 #~ msgstr "Oppdater utvalg"
@@ -30485,4 +31078,7 @@
 #~ msgid "OSM username (e-mail)"
 #~ msgstr "OSM-brukernavn (e-post)"
+
+#~ msgid "Plugin {0} requires JOSM update to version {1}."
+#~ msgstr "Programtillegg {0} krever JOSM-oppdatering til versjon {1}."
 
 #~ msgid "Edit Station"
@@ -30558,4 +31154,22 @@
 #~ "Verktøy for å redigere opphavspersoner/brukere. Velger kartdata fra valgt "
 #~ "bruker, åpner brukerprofil i nettleser."
+
+#~ msgid "Edit Demanding Mountain Hiking"
+#~ msgstr "Rediger krevende fjellsti"
+
+#~ msgid "Edit Hiking"
+#~ msgstr "Rediger tursti"
+
+#~ msgid "Edit Mountain Hiking"
+#~ msgstr "Rediger fjellsti"
+
+#~ msgid "Edit Demanding Alpine Hiking"
+#~ msgstr "Rediger krevende alpin fjellsti"
+
+#~ msgid "Edit Difficult Alpine Hiking"
+#~ msgstr "Rediger vanskelig alpin fjellsti"
+
+#~ msgid "Edit Alpine Hiking"
+#~ msgstr "Rediger alpin fjellsti"
 
 #~ msgid "Edit Information Office"
@@ -30652,4 +31266,7 @@
 #~ msgid "Select a starting node on the end of a way"
 #~ msgstr "Velg en startnode i enden av en linje"
+
+#~ msgid ">"
+#~ msgstr ">"
 
 #~ msgid "History item"
@@ -30713,4 +31330,7 @@
 #~ msgstr "Ingen data"
 
+#~ msgid "Conflicts in data"
+#~ msgstr "Konflikter i data"
+
 #~ msgid "Remove relation member {0} {1}"
 #~ msgstr "Fjern relasjonsmedlem {0} {1}"
@@ -30742,7 +31362,16 @@
 #~ "\"{1}\">norsk bokmål</A>."
 
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "parameter «{0}» må ha en verdi"
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "Uventet returverdi. Mottok {0}."
 
+#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "Parameter «{0}» > 0 forventet – leste «{1}»."
+
+#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
+#~ msgstr "parameter «{0}» er ikke en tillatt klasse – leste «{1}»"
+
 #~ msgid "There's no primitive with version {0} in this history."
 #~ msgstr "Denne historikken har ikke noe element med versjon {0}"
@@ -30751,4 +31380,7 @@
 #~ msgstr "Denne historikken har ikke noen gyldig versjon for dato «{0}»"
 
+#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
+#~ msgstr "parameter «{0}» i intervall 0–{1} forventet – leste {2}"
+
 #~ msgid "No earliest version found. History is empty."
 #~ msgstr "Fant ingen første versjon. Historikken er tom."
@@ -30756,4 +31388,13 @@
 #~ msgid "No latest version found. History is empty."
 #~ msgstr "Fant ingen siste versjon. Historikken er tom."
+
+#~ msgid "Parameter current out of range. Got {0}."
+#~ msgstr "parameter «current» utenfor rekkevidde: leste {0}"
+
+#~ msgid "Unexpected column index. Got {0}."
+#~ msgstr "Uventet kolonneindeks: {0}"
+
+#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
+#~ msgstr "Parameter «col» må være 0 eller 1. Leste {0}."
 
 #~ msgid "Index out of bounds. Got {0}."
@@ -30772,2 +31413,8 @@
 #~ "ugyldig verdi for obligatorisk attributt «{0}» av type «int» (>= 0) – leste "
 #~ "«{1}»"
+
+#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
+#~ msgstr "parameter «{0}» >= 0 forventet – leste «{1}»"
+
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "Parameter ''{0}'' kan ikke vœre null"
Index: applications/editors/josm/i18n/po/nl.po
===================================================================
--- applications/editors/josm/i18n/po/nl.po	(revision 19689)
+++ applications/editors/josm/i18n/po/nl.po	(revision 19698)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 23:20-0500\n"
-"PO-Revision-Date: 2010-01-18 11:19-0500\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-23 21:59+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Dutch <nl@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-01-13 18:28+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -70,11 +70,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -95,4 +95,5 @@
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
+"Parameter \"downloadgps\" accepteert geen bestandsnamen of bestands-URLs"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:497
@@ -220,5 +221,5 @@
 #, java-format
 msgid "Click to continue and to open {0} browsers"
-msgstr ""
+msgstr "Klik om door te gaan en om {0} browsers te openen"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:98
@@ -243,5 +244,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -255,13 +256,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -270,5 +271,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -278,5 +282,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100
 msgid "Click to abort launching external browsers"
-msgstr ""
+msgstr "Klik hier om het openen van de externe browsers te annuleren"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132
@@ -295,5 +299,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Samenvoegen"
@@ -324,5 +328,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -389,9 +393,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -399,5 +403,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "OK"
@@ -448,6 +454,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -465,5 +471,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -472,11 +478,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -513,5 +519,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "conflict"
@@ -523,9 +529,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37
 msgid "previous"
-msgstr ""
+msgstr "vorige"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38
 msgid "next"
-msgstr ""
+msgstr "volgende"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
@@ -646,14 +652,14 @@
 msgstr "Selecteer twee of meer wegen om te combineren."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Kopiëren"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Geselecteerde objecten naar klembord kopiëren"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Selecteer iets om te kopiëren"
@@ -686,8 +692,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -696,5 +702,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -751,16 +757,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Er waren {0} tegenstrijdigheden tijdens het importeren."
-msgstr[1] "Er waren {0} tegenstrijdigheden tijdens het importeren."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "Conflikten gedurende ophalen"
-msgstr[1] "Conflikten gedurende ophalen"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -781,4 +786,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -788,4 +795,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Dupliceer selectie door kopiëren en direct plakken."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Weg dupliceren"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "De geselecteerde leden omhoog verplaatsen"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "Laag: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "Inzoomen op {0}"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr ""
 
 #. <button label="Info" hotkey="I">
@@ -863,5 +898,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:126
 msgid "Please select at least one closed way that should be joined."
-msgstr ""
+msgstr "Selecteer op z'n minst één gesloten weg die samengevoegd moet worden."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:132
@@ -876,10 +911,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 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] "De geselecteerde weg bevat niet de geselecteerde knoop."
-msgstr[1] "De geselecteerde weg bevat niet alle geselecteerde knopen."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -1002,5 +1036,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "URL"
@@ -1153,21 +1187,22 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
-msgstr ""
+#, fuzzy
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
+msgstr "<html>Kan directory niet openen.<br>Selecteer alstublieft een bestand!"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:121
 msgid "Open file"
-msgstr ""
+msgstr "Bestand openen"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:160
 msgid "Opening 1 file..."
-msgstr ""
+msgstr "Bezig met 1 bestand te openen..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Bestanden aan het openen"
-msgstr[1] "Bestanden aan het openen"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1223,7 +1258,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1237,5 +1272,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "Knopen zodanig verplaatsen dat alle hoeken 90 of 270 graden zijn."
 
@@ -1269,4 +1305,8 @@
 "undesirable results when doing rectangular alignments.<br>Change your "
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+msgid "Selection must consist only of ways and nodes."
 msgstr ""
 
@@ -1282,5 +1322,16 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204
 msgid "Selected Elements cannot be orthogonalized"
-msgstr ""
+msgstr "Geselecteerde elementen kunnen niet recht worden gelegd."
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr "Selecteer wegen met nagenoeg rechte hoeken om orthogonaal te maken."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1297,9 +1348,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151
 msgid "Delete incomplete members?"
-msgstr ""
+msgstr "Verwijder oncomplete delen?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152
 msgid "Paste without incomplete members"
-msgstr ""
+msgstr "Plakken zonder oncomplete delen"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
@@ -1386,18 +1437,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1422,12 +1473,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Fout"
@@ -1562,5 +1614,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1772,9 +1824,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "Duplicaatknopen {0} in {1} knopen"
-msgstr[1] "Duplicaatknopen {0} in {1} knopen"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1818,5 +1870,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr "Ophalen data"
@@ -1825,5 +1877,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:27
 msgid "Update modified"
-msgstr ""
+msgstr "Update veranderd"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:25
@@ -1831,4 +1883,5 @@
 "Updates the currently modified objects from the server (re-downloads data)"
 msgstr ""
+"Update de huidig veranderde objecten van de server (download de data opnieuw)"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74
@@ -2249,6 +2302,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2286,4 +2339,7 @@
 "Really move them?"
 msgstr ""
+"U heeft meer dan {0} elementen verplaatst. Het verplaatsen van een groot "
+"aantal elementen is meestal een fout.\n"
+"Wilt u ze echt verplaatsen?"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
@@ -2328,7 +2384,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
-#, fuzzy
 msgid "<not>"
-msgstr "noord"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
@@ -2370,5 +2425,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Naar objecten zoeken."
@@ -2417,8 +2472,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:119
-#, fuzzy
 msgid "<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name."
 msgstr ""
-"<b>\"Lange straat\"</b> - ''Lange'' en ''straat'' in een sleutel of naam."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:120
@@ -2561,5 +2614,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Zoeken"
@@ -2599,25 +2652,22 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "CS"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
-msgstr "CI"
+msgstr ""
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
-msgstr "RX"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2631,5 +2681,5 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2637,5 +2687,5 @@
 "van gebruik: sleutel=waarde."
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2658,7 +2708,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
-msgstr "Onverwacht token: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
@@ -2780,9 +2830,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "{0} objecten toegevoegd"
-msgstr[1] "{0} objecten toegevoegd"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2832,12 +2882,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "Verwijder \"{0}\" voor {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Stel in {0}={1} voor {2} {3}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2901,17 +2951,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Verwijdermodus"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Verwijder {0} weg"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Verwijder {0} relatie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2957,5 +3007,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:443
 msgid "Delete confirmation"
-msgstr ""
+msgstr "Bevestig verwijderen"
 
 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:46
@@ -2992,9 +3042,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "\"{0}\" objecten verwijderd"
-msgstr[1] "\"{0}\" objecten verwijderd"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -3039,32 +3089,32 @@
 #, java-format
 msgid "Resolve {0} tag conflicts in relation {1}"
-msgstr ""
+msgstr "Los {0} tag conflicten op in relatie {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "Undelete {0} primitive"
 msgid_plural "Undelete {0} primitives"
-msgstr[0] "aan {0} primitief"
-msgstr[1] "aan {0} primitieven"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for node {0}"
-msgstr "Conflicten oplossen in coördinaten in {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for way {0}"
-msgstr "Conflicten oplossen in coördinaten in {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Los conflikten op in leden lijst van relatie {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
 #, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr ""
+msgstr "Los conflicten op in knooppunten lijst van weg {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70
@@ -3194,4 +3244,6 @@
 "Warning: Missing preference file ''{0}''. Creating a default preference file."
 msgstr ""
+"Waarschuwing: Voorkeuren bestand \"{0}\" ontbreekt. Standaard voorkeuren "
+"bestand wordt aangemaakt."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
@@ -3201,4 +3253,6 @@
 "file."
 msgstr ""
+"Waarschuwing: Vervangen van bestaand voorkeuren bestand \"{0}\" door "
+"standaard voorkeuren bestand."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
@@ -3307,5 +3361,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3313,5 +3367,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3319,5 +3373,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3325,5 +3379,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3348,5 +3402,5 @@
 #, java-format
 msgid "Missing merge target for way with id {0}"
-msgstr ""
+msgstr "Samenvoeg doel voor weg met id {0} ontbreekt"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162
@@ -3354,20 +3408,20 @@
 #, java-format
 msgid "Missing merge target for node with id {0}"
-msgstr ""
+msgstr "Samenvoeg doel voor knooppunt met id {0} ontbreekt"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185
 #, java-format
 msgid "Missing merge target for object with id {0}"
-msgstr ""
+msgstr "Samenvoeg doel voor object met id {0} ontbreekt"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241
 #, java-format
 msgid "Missing merge target for relation with id {0}"
-msgstr ""
+msgstr "Samenvoeg doel voor relatie met id {0} ontbreekt"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
-msgstr ""
+msgstr "Samenvoeg doel van type {0} met id {1} ontbreekt"
 
 #. should not happen
@@ -3386,5 +3440,5 @@
 msgctxt "filter"
 msgid "E"
-msgstr ""
+msgstr "I"
 
 #. column header: hide filter
@@ -3402,15 +3456,13 @@
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "CS"
+msgstr ""
 
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
-#, fuzzy
 msgctxt "filter"
 msgid "I"
-msgstr "CI"
+msgstr ""
 
 #. column header: filter mode
@@ -3423,8 +3475,7 @@
 #. filter mode: replace
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210
-#, fuzzy
 msgctxt "filter"
 msgid "R"
-msgstr "RX"
+msgstr ""
 
 #. filter mode: add
@@ -3446,19 +3497,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3467,5 +3518,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3473,5 +3524,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3594,6 +3645,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3603,5 +3654,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3612,7 +3663,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3634,5 +3685,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "achtergrond"
@@ -3776,6 +3827,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3783,37 +3834,38 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "onvolledig"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "snelweg"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "spoorweg"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "waterweg"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "grondgebruik"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3822,10 +3874,10 @@
 msgstr[1] "{0} knopen"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3834,5 +3886,5 @@
 msgstr[1] "{0} leden"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3869,6 +3921,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Conflict"
@@ -3879,7 +3931,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-#, fuzzy
-msgid "Authorization Failed"
-msgstr "Verbinding is mislukt."
+msgid "Authorisation Failed"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
@@ -4084,5 +4135,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Initialiseren"
@@ -4125,5 +4175,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4134,5 +4184,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Bewerken"
@@ -4203,29 +4253,29 @@
 msgstr "schalen"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "De geografische lengtegraad bij de cursor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 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:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "De geografische breedtegraad bij de cursor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 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:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 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:106
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 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:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4233,9 +4283,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(geen object)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4398,16 +4448,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Tags ({0} conflicten)"
-msgstr[1] "Tags ({0} conflicten)"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "{0} pending tag conflict to be resolved"
 msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} tag-conflicten om op te lossen"
-msgstr[1] "{0} tag-conflicten om op te lossen"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
@@ -4462,16 +4512,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4667,8 +4717,12 @@
 msgstr "Knoop"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr "Knopen in de oudste samenvoegen"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4816,5 +4870,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr ""
@@ -4860,5 +4914,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -4988,10 +5047,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "geen"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "alles"
@@ -5021,7 +5080,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-#, fuzzy, java-format
+#, java-format
 msgid "Tag collection does not include the selected value ''{0}''."
-msgstr "De geselecteerde weg bevat niet de geselecteerde knoop."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
@@ -5071,7 +5130,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -5081,6 +5140,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5260,10 +5319,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5283,13 +5342,13 @@
 msgstr "Opdrachtenlijst: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Oplossen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
@@ -5297,6 +5356,6 @@
 "lijst openen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5330,8 +5389,9 @@
 msgid ""
 "<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions won't be applied unless all differences<br>are "
-"resolved.Click <strong>{0}</strong> to close anyway."
-"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<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 ""
 
@@ -5354,5 +5414,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5361,5 +5421,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5439,43 +5499,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Lagen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 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:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Tonen/Verbergen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Weg dupliceren"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 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:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "De geselecteerde laag een rij omlaag verplaatsen."
@@ -5489,6 +5554,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Relaties"
@@ -5498,69 +5563,69 @@
 msgstr "Een lijst met alle relaties openen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relaties: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Een editor voor de geselecteerde relatie openen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "De geselecteerde relatie verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Een nieuwe relatie aanmaken"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Huidige selectie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Een selectielijstscherm openen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Naar de geselecteerde element(en) zoomen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Op selectie inzoomen."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sel.: Rel.:{0} / Wegen:{1} / Knopen:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5568,5 +5633,5 @@
 msgstr "Selectie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5919,8 +5984,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -5992,4 +6055,7 @@
 #. <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 />
@@ -6068,6 +6134,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6109,6 +6176,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6577,152 +6646,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Naam"
@@ -7105,5 +7176,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<verschillend>"
@@ -7158,55 +7229,55 @@
 msgstr "Eigenschappen toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Eigenschappen: {0} / Leden: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Eigenschappen / Leden"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Relatie wijzigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "Uit relatie verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Selectie uit relatie {0} zeker verwijderen?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "De geselecteerde sleutel in alle objecten verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "Eigenschappen verwijderen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Een nieuwe sleutel/waarde aan alle objecten toevoegen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "De geselecteerde sleutelwaarde voor alle objecten bewerken"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7533,7 +7604,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
-#, fuzzy
 msgid "Do you really want to apply the new role?"
-msgstr "Wil je dit toestaan?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
@@ -7628,9 +7698,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr ""
-"Negeren uitzondering omdat ophalen afgebroken is. Uitzondering was: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
@@ -7650,47 +7719,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Bladwijzers"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../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:187
+#: ../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:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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:212
+#: ../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:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr ""
@@ -7815,18 +7883,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -7837,34 +7905,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
 msgid "Enter a place name to search for:"
 msgstr "Voer een plaats in om naar te zoeken:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+#: ../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:147
+#: ../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:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Nulwijzeruitzondering, mogelijk ontbreken er wat tags."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr ""
@@ -7875,7 +7943,9 @@
 #. 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" />
@@ -7884,10 +7954,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Soort"
@@ -7896,5 +7967,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -7906,17 +7977,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "onbekend"
@@ -8269,5 +8339,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr "Conflicten gedetecteerd"
@@ -8721,9 +8791,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8733,7 +8803,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -8745,16 +8815,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "laag"
@@ -9170,68 +9240,68 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "GPS-punt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Lijntekening aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../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:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Kleur aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Standaard"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Kies een kleur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr "Markers van benoemde punten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Benoemde trackpunten van {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Geluid importeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9241,23 +9311,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-geluidsbestanden (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Geluidsmarkers van {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Afbeeldingen importeren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9267,5 +9337,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9273,5 +9343,5 @@
 msgstr "Naam: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9279,5 +9349,5 @@
 msgstr "Beschrijving: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9287,23 +9357,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "Beschrijving"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Lengte: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9312,5 +9382,5 @@
 msgstr[1] "{0} routes, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9319,10 +9389,10 @@
 msgstr[1] "{0} waypoints"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Naar gegevenslaag omzetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9332,43 +9402,43 @@
 "zijn.<br>Als je sporen wilt uploaden, kijk dan hier:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Omgezet van: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "Uit OSM langs deze track downloaden"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Alles downloaden binnen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meters"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "Maximum oppervlak per verzoek:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9379,9 +9449,9 @@
 "verder<br>gaan?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 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:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9391,5 +9461,5 @@
 "de track zijn overgeslagen of naar de start verplaatst."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9399,23 +9469,23 @@
 "kunnen schatten, zijn overgeslagen."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Gegevenslaag {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "buiten gedownload gebied"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr "versie {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9424,5 +9494,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9436,5 +9506,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9447,11 +9517,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9460,32 +9530,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} bestaat uit:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr "API-versie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Naar GPX-laag omzetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9532,28 +9602,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "GPS-punten"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX-bestanden (*.gpx, *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, 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:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Fout tijdens ontleden {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Kan \"{0}\" niet lezen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9565,34 +9634,34 @@
 "een tijdzone<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr "Fototijd (uit exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 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:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr "Ik bevind mij in tijdzone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "Geen datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr "Open een andere foto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 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:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9602,64 +9671,64 @@
 "Gebruik de verwachte indeling a.u.b."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "Ongeldige datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr "<Nog geen GPX-track geladen>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr "GPX-track: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr "Een ander GPX-spoor openene"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr "Tijdzone: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr "Verschuiving:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9669,45 +9738,45 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr "Verband tussen afbeeldingen en GPX-tracks leggen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr "Correleer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr "Ongeldige tijdzone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr "Ongeldige verschuiving"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Tijdzone: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuten: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Seconden: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9716,5 +9785,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9722,21 +9791,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 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:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr "Tijdzone en tijdverschil aanpassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 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:951
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr "Foto''s bevatten geen tijdinformatie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -9745,17 +9814,17 @@
 "De geselecteerde GPX-track bevat geen tijdmarkering. Selecteer een andere."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr "GPX-track heeft geen tijdinformatie"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr "U mag een GPX-track selecteren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr "Geen GPX-tracks geselecteerd"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9766,5 +9835,5 @@
 "Verwachte indeling: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9775,75 +9844,75 @@
 "Verwachte indeling: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "GPS-locaties uit EXIF halen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr "Mappenscan starten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "Foto's lezen..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Lezen {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, 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:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Map {0} scannen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, 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:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, 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:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Geotagged afbeeldingen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr "Met GPX relateren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "Geen gegevens geladen."
-msgstr[1] "Geen gegevens geladen."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
+#, java-format
 msgid "{0} was found to be GPS tagged."
 msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] "{0} zijn getagd als GPS"
-msgstr[1] "{0} zijn getagd als GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -9852,5 +9921,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -9947,5 +10016,5 @@
 msgstr "GPS-marker"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -9953,5 +10022,5 @@
 msgstr[1] "markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -9960,29 +10029,29 @@
 msgstr[1] "{0} bestaat uit {1} markers"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "Geluid synchroniseren"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 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:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr "Geluid gesynchroniseerd op punt {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr "Geluidsmarker op afspeelstart zetten"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -9992,17 +10061,17 @@
 "marker wilt hebben."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 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:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Tekst/pictogrammen tonen/verbergen"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 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:171
+#: ../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 "
@@ -10012,5 +10081,5 @@
 "geluidsopname afspeelde (na de eerste marker)."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -10020,5 +10089,5 @@
 "of op het trackpunt waar je wilt synchroniseren."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "Kan nieuwe geluidsmarker niet aanmaken."
@@ -10044,5 +10113,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
 #, java-format
 msgid ""
@@ -10050,5 +10119,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
 #, java-format
 msgid ""
@@ -10100,8 +10169,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize URL:"
-msgstr "Auteur"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10191,8 +10258,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize now"
-msgstr "Auteur"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10251,7 +10316,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
-#, fuzzy
 msgid "OAuth authorization failed"
-msgstr "Verbinding is mislukt."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
@@ -10331,8 +10395,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
-#| msgid "Please select at least four nodes."
 msgid "Please select an authorization procedure: "
-msgstr "Selecteer minstens vier knopen."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10342,8 +10404,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
-#, fuzzy
-#| msgid "Close dialog and cancel downloading"
 msgid "Close the dialog and cancel authorization"
-msgstr "Sluit dialoog en stop het downloaden"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
@@ -10656,5 +10716,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Selecteer een rij om te bewerken."
@@ -10668,5 +10728,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10820,9 +10880,4 @@
 msgstr "Tekenstijl {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "Laag: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -10852,6 +10907,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr "Alles"
@@ -10890,8 +10945,8 @@
 msgstr "Enkele kleur (kan voor lagen met een naam ingesteld worden)"
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Auto"
@@ -10913,13 +10968,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Fiets"
@@ -10952,12 +11007,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "Te voet"
@@ -11009,11 +11064,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
-#, fuzzy
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
 "draw all lines."
 msgstr ""
-"Maximum lengte (in meters) om lijnen tekenen. Kies ''-1'' om alle lijnen "
-"tekenen."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
@@ -11315,5 +11367,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
-#, fuzzy
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11329,15 +11380,4 @@
 "keyboard...</p>"
 msgstr ""
-"<p>Het kan je opgevallen zijn dat de toetsenselectielijst op de volgende "
-"pagina alle toetsen weergeeft op alle soorten toetsenborden die bekend zijn "
-"bij Java, en niet alleen de toetsen van jouw toetsenbord. Gebruik alleen die "
-"waarden die overeenkomen met een bestaande toets van je toetsenbord. Dus als "
-"je toetsenbord geen Copy-toets heeft (PC-toetsenborden hebben hem niet, Sun-"
-"toetsenborden wel), gebruik deze toets dan ook niet. Ook zullen er 'toetsen' "
-"in de lijst staan die overeenkomen met een sneltoets op je toetsenbord (b.v. "
-"':'). Gebruik deze ook niet, maar in plaats daarvan de basistoets (';' op US-"
-"toetsenborden, '.' op Duitse toetsenborden, enz.). Als je deze regels "
-"overtreedt kunnen er conflicten ontstaan omdat JOSM niet kan weten dat CTRL"
-"+SHIFT+; en CTRL+: op een US-toetsenbord eigenlijk hetzelfde is...</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
@@ -11958,5 +11998,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -11964,18 +12011,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "Optionele attributen:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr "afgesloten weg"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Onbekend type: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -11986,16 +12033,16 @@
 msgstr "Kan voorkeuzebron voor tagging niet lezen: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fout bij ontleden van {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, 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:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -12004,18 +12051,17 @@
 msgstr[1] "{0} objecten wijzigen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "Niets geselecteerd!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "Selectie is ongeschikt!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "Voorinstelling toepassen"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Eigenschappen veranderen"
@@ -12291,6 +12337,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12315,9 +12361,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Ontleedfout: documentstructuur van GPX-bestand is ongeldig"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12333,7 +12379,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
-#, fuzzy
 msgid "Looking for image files"
-msgstr "Zoeken naar de oever..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
@@ -12341,7 +12386,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
@@ -12413,5 +12464,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "Geïmporteerde coördinaten: "
@@ -12512,9 +12563,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Versturen van {0} objecten ..."
-msgstr[1] "Versturen van {0} objecten ..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -13041,9 +13092,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159
-#, fuzzy, java-format
+#, java-format
 msgid "({0}/{1}) Uploading {2} object..."
 msgid_plural "({0}/{1}) Uploading {2} objects..."
-msgstr[0] "Versturen van {0} objecten ..."
-msgstr[1] "Versturen van {0} objecten ..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
@@ -13141,5 +13192,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -13147,6 +13198,6 @@
 "Plugin {0} requires {1} plugins which were not found. The missing plugins "
 "are:"
-msgstr[0] "Plugin {1} heeft plugin {0} nodig, maar deze is niet aangetroffen."
-msgstr[1] "Plugin {1} heeft plugin {0} nodig, maar deze is niet aangetroffen."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13414,5 +13465,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13420,8 +13470,4 @@
 "file a bug report."
 msgstr ""
-"Een onverwachte uitzondering is opgetreden.\n"
-"\n"
-"Dit is altijd een programmeerfout. Als je de nieuwste versie\n"
-"van JOSM gebruikt, wees dan vriendelijk en dien een foutenrapport in."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13513,6 +13559,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -13628,6 +13674,6 @@
 msgstr "Kan geen vertaling voor taalgebied {0} vinden. Naar {1} terugvallen."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13636,5 +13682,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -13782,4 +13828,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr ""
@@ -13870,5 +13917,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "Adresinterpolatie"
@@ -14460,5 +14507,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr "Locatie"
@@ -14621,21 +14668,21 @@
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr ""
@@ -14667,9 +14714,9 @@
 msgstr "Weg dupliceren"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -14684,13 +14731,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr "Pad van GPX-laag importeren"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr "Bestaand pad laten vallen"
@@ -14699,6 +14746,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr "Geen GPX-gegevenslaag gevonden."
@@ -14927,17 +14974,17 @@
 msgstr "Verzameling afbeeldingen laden als een nieuwe laag."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr "Richtingsindex '{0}' niet gevonden"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr "De beginlocatie bevindt zich buiten de bbox"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:105
 msgid "Looking for shoreline..."
 msgstr "Zoeken naar de oever..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -14981,42 +15028,41 @@
 msgstr "Dubbele knopen verwijderen..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr "Lakewalker-trace"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "oost"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "noordoost"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "noord"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "noordwest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "west"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "zuidwest"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "zuid"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "zuidoost"
@@ -15072,6 +15118,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -15080,74 +15126,74 @@
 msgstr "water"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "kustlijn"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "land"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Maximum number of segments per way"
 msgstr "Maximum aantal segmenten per weg"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
 msgid "Maximum number of nodes in initial trace"
 msgstr "Maximum aantal knopen in oorspronkelijke spoor"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Maximale grijswaarde die als water geldt (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
 msgid "Line simplification accuracy (degrees)"
 msgstr "Nauwkeurigheid lijnvereenvoudiging (graden)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Resolutie van Landsat-tegels (pixels per graad)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Grootte van Landsat-tegels (pixels)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
 msgid "Shift all traces to east (degrees)"
 msgstr "Alle sporen oostwaarts verschuiven (graden)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
 msgid "Shift all traces to north (degrees)"
 msgstr "Alle sporen noordwaarts verschuiven (graden)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
 msgid "Direction to search for land"
 msgstr "Richting om naar land te zoeken"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
 msgid "Tag ways as"
 msgstr "Wegen taggen als"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr "WMS-laag"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr "Maximale buffergrootte (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
 msgid "Maximum cache age (days)"
 msgstr "Maximale bufferleeftijd (dagen)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:68
 msgid "Source text"
 msgstr "Brontekst"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Maximum aantal segmenten toegestaan in een aangemaakte weg (standaard 250)."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -15157,5 +15203,5 @@
 "50000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -15165,5 +15211,5 @@
 "IR-1-gegevens). Tussen 0-255, standaard 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -15174,5 +15220,5 @@
 "Standaard 0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -15180,55 +15226,55 @@
 "Resolutie van Landsat-tegels, gemeten in pixels per graad. Standaard 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Grootte van een landsat-tegel, gemeten in pixels. Standaard 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Alle punten oostwaarts verschuiven (graden). Standaard 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Alle punten noordwaarts verschuiven (graden). Standaard 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Direction to search for land. Default east."
 msgstr "Richting om land te zoeken. Standaard oost."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr "Wegen als water, kustlijn, land of niets taggen. Standaard is water."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 "Welke WMS-laag als achtergrond gebruiken voor tracing? Standaard is IR1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "Maximum grootte van een buffermap in bytes. Standaard is 300 MB."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 "Maximum leeftijd voor een gebufferd bestand in dagen. Standaard is 100."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr "Gegevensbron tekst. Standaard is Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "Een plugin om waterlichamen op Landsat-beeldmateriaal te tracen."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr "Voorkeuren Lakewalker-plugin"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:50
 msgid "Downloading image tile..."
 msgstr "Afbeeldingstegel downloaden..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr "Kan afbeelding niet ophalen"
@@ -15252,5 +15298,5 @@
 msgstr "Verbinding is mislukt"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr ""
@@ -15281,5 +15327,5 @@
 msgstr "Baan"
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr "LiveGPS-laag"
@@ -15353,5 +15399,5 @@
 msgstr "Hoek tussen twee geselecteerde knopen"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr "Laag om in te meten"
@@ -15617,4 +15663,76 @@
 msgid "Firefox executable"
 msgstr "Firefox-executable"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#, fuzzy
+msgid "Read error!"
+msgstr "Reservoir"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Coördinaten van de nieuwe knoop invoeren."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Backupbestanden behouden"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Fout"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "Ingevoerde tijd kon niet worden ontleed."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Kon bestand ''{0}'' niet hernoemen"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Backupbestanden behouden"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "Backupbestanden behouden"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Overschrijven?"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+#, fuzzy
+msgid "Could not delete temporary file!"
+msgstr "Kan elementsoort niet vinden"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
@@ -15891,6 +16009,6 @@
 msgstr "Verkregen gegevens iedere minuut naar bestand schrijven."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -16012,72 +16130,130 @@
 msgstr "U dient eerst bronnen van tagvoorkeuzen in Voorkeuren op te geven."
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+#, fuzzy
+msgid "Terrace a house"
+msgstr "Rijtjeshuis maken"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+#, fuzzy
+msgid "Interpolation"
+msgstr "Adresinterpolatie"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Straten"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Tegelnummers"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Puntnummer"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+#, fuzzy
+msgid "Lowest housenumber of the terraced house"
+msgstr "De huisnummers op een terras omkeren"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Een nieuwe relatie aanmaken"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Weg dupliceren"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Straatnaam"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr "Het terras omkeren"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr "De huisnummers op een terras omkeren"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr "Een terras omkeren"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../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:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr "Rijtjeshuis maken"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr "Maak losse gebouwen uit een langgerekt gebouw."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr "Terras"
@@ -16313,5 +16489,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr "Dubbele knopen"
@@ -16322,5 +16498,5 @@
 "Deze test controleert of er geen knopen met precies dezelfde locatie zijn."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16332,9 +16508,9 @@
 "niet ziet) ze kunnen gebruiken.<br>Wil je ze echt verwijderen?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr ""
@@ -16369,5 +16545,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr "Multipolygoon"
@@ -16521,7 +16697,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr "Ongeldige tag/waarde-combinaties"
@@ -16529,81 +16705,81 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr "Tekenprobleem"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Toets ''{0}'' is ongeldig."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr "Tags met lege waarden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr "Ongeldige eigenschapsleutel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr "Ongeldige spatie in eigenschapsleutel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr "Eigenschapwaarde begin of eindigt met een spatie"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr "Eigenschapwaarden bevatten HTML-codes"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Sleutel \"{0}\" ontbreekt in voorkeuze."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr "Voorkeuzen bevatten geen eigenschapsleutel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Waarde \"{0}\" voor sleutel \"{1}\" niet in voorkeuze."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr "Voorkeuzen bevatten geen eigenschapswaarde"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr "Herstel-mij's"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr "Eigenschapsleutels controleren."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Valideer eigenschapsleutels met een woordenlijst"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr "Uitgebreide eigenschapchecker gebruiken"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 "Valideer eigenschapwaarden en -tags door uitgebreide regels toe te passen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr "Tagcheckerbron"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16614,86 +16790,86 @@
 "tagchecker."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr "Nieuwe bron aan lijst toevoegen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr "De geselecteerde bron bewerken."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "De geselecteerde bron uit de lijst verwijderen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "Gegevensbronnen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr "Eigenschapwaarden controleren."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr "Valideer eigenschapwaarden tegen presets"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr "Controleer op herstel-mij's."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Knopen of wegen met 'FIXME' in de eigenschapwaarden zoeken."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr "Controleer op tekenknopen."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr "Controleer of kaarttekenen fouten heeft gevonden."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr "Standaardgegevensbestand gebruiken."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr "Het standaardgegevensbestand gebruiken (aanbevolen)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr "Standaardbestand spellingscontrole gebruiken."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Het standaardbestand spellingscontrole gebruiken (aanbevolen)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr "Eigenschappen herstellen"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr "Kan elementsoort niet vinden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr "Kan waarschuwingsniveau niet vinden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Ongeldige expressie ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -17140,5 +17316,5 @@
 msgstr "WMS-laag ({0}), in zoom {1} downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -17149,64 +17325,64 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
-msgid ""
-"The requested area is too big. Please zoom in a little, or change resolution"
-msgstr ""
-"Het gevraagde gebied is te groot. Zoom iets in of verander de resolutie"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
 msgid "Download visible tiles"
 msgstr "Zichtbare tegels downloaden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+msgid ""
+"The requested area is too big. Please zoom in a little, or change resolution"
+msgstr ""
+"Het gevraagde gebied is te groot. Zoom iets in of verander de resolutie"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "Resolutie veranderen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr "Foutieve tegels herladen"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "WMS-laag in bestand opslaan"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "WMS-laag uit bestand laden"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, 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:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr "Fout in bestandsindeling"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "Laden bestand is mislukt"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -17462,6 +17638,13 @@
 msgstr ""
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17470,15 +17653,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17487,10 +17670,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17499,15 +17682,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17517,10 +17700,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17529,5 +17712,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17536,10 +17719,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -17646,6 +17829,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -17653,6 +17845,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "Referentie"
@@ -17669,5 +17862,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Lanen"
@@ -17689,10 +17882,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Max. snelheid (km/u)"
@@ -17736,14 +17929,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "Éénrichtingsweg"
@@ -17786,13 +17979,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -17830,13 +18023,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -17871,13 +18064,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "Verdieping"
@@ -17912,13 +18105,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "Verhoging"
@@ -18050,4 +18243,13 @@
 msgid "Edit Unclassified Road"
 msgstr "Een enkelbaansweg bewerken"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr ""
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -18065,15 +18267,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr "Breedte (meters)"
@@ -18085,5 +18287,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Woongebied"
@@ -18092,5 +18294,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "Een straat bewerken"
@@ -18108,16 +18310,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Oppervlakte"
@@ -18139,166 +18344,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr "verhard"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr "onverhard"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "oerbos"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr "kinderhoofdjes"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "gravel"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "gras"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "zand"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr "gebied"
@@ -18306,5 +18518,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr "Woonerf"
@@ -18313,5 +18525,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr "Een woonerf bewerken"
@@ -18319,5 +18531,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "Voetgangers"
@@ -18326,5 +18538,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "Voetgangerszone bewerken"
@@ -18332,5 +18544,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr "Toegangsweg"
@@ -18339,5 +18551,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr "Een toegangsweg bewerken"
@@ -18347,18 +18559,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr "oprit"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr ""
@@ -18366,5 +18578,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr "Parkeergang"
@@ -18374,5 +18586,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr "Een parkeergang bewerken"
@@ -18380,5 +18592,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "Weg (onbekend soort)"
@@ -18387,5 +18599,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "Een weg van onbekend soort bewerken"
@@ -18394,20 +18606,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "Toegangsbeperkingen"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "Toegangsbeperkingen bewerken"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "Tol"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "Doodlopende weg"
@@ -18415,9 +18627,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 msgid "Access"
 msgstr "Toegang"
 
 #. 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"
@@ -18428,6 +18641,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18439,4 +18650,5 @@
 #. 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"
@@ -18455,141 +18667,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+msgid "yes"
+msgstr "ja"
+
+#. 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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "privé"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+msgstr "bestemmingsverkeer"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:219
+msgid "destination"
+msgstr "bestemming"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr "toestemming"
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr "landbouw"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-msgid "yes"
-msgstr "ja"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "privé"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-msgstr "bestemmingsverkeer"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "bestemming"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr "toestemming"
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr "landbouw"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "nee"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr "Goederen"
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Zwaar vrachtverkeer"
@@ -18604,10 +18824,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr "Ruiters"
@@ -18623,10 +18843,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "Motorfiets"
@@ -18641,27 +18861,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr "Gemotoriseerd verkeer"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr "Openbaar vervoer"
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr "Motorboot"
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "Pleziervaart"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Min. snelheid (km/u)"
@@ -18669,25 +18881,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "Max. gewicht (tonnen)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr "Max. hoogte (meters)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr "Max. breedte (meters)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr "Max. lengte (meters)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "Rotonde"
@@ -18698,5 +18910,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "Een splitsing bewerken"
@@ -18716,10 +18928,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "Autosnelweg"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr "op- en afrit autosnelweg"
@@ -18741,10 +18953,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "autoweg"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr "op- en afrit autoweg"
@@ -18766,10 +18978,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "provinciale weg"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr "op- en afrit provinciale weg"
@@ -18791,5 +19003,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -18804,9 +19016,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "weg buiten bebouwde kom"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr "niet geklassificeerd"
@@ -18820,9 +19032,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "woongebied"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr "woonerf"
@@ -18852,10 +19064,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "toegangsweg"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr "busbaan"
@@ -18885,5 +19097,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -18895,10 +19107,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Een brug bewerken"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr "Een tunnel bewerken"
@@ -18906,19 +19118,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Wegen"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "Werkzaamheden"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "Een autosnelweg met werkzaamheden bewerken"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "Splitsing"
@@ -18934,5 +19146,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "rotonde"
@@ -18940,5 +19152,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr "Track"
@@ -18947,40 +19159,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr "Track bewerken"
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "Track"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "gravel"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "gravel"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "gravel"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "gravel"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "gravel"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr ""
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -18988,5 +19194,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -18994,37 +19200,32 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "Bergwandelen"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
-msgstr "Bergwandelen (stevig)"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
-msgstr "Bergklimmen"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
-msgstr "Bergklimmen (stevig)"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
-msgstr "Bergklimmen (moeilijk)"
+msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "Pad"
@@ -19033,12 +19234,32 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "Pad bewerken"
 
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
+
 #: build/trans_presets.java:489
-#, fuzzy
 msgid "Wheelchairs"
-msgstr "Rolstoel"
+msgstr ""
 
 #: build/trans_presets.java:490
@@ -19054,7 +19275,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "Ruiterpad bewerken"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -19067,7 +19287,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "Fietspad bewerken"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -19102,24 +19321,21 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "Toch combineren"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "Voetpad bewerken"
+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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Voetpad bewerken"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr ""
@@ -19127,5 +19343,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "Trap"
@@ -19135,5 +19351,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Trap bewerken"
@@ -19141,10 +19357,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr "Waypoints"
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "Snelwegkruising"
@@ -19152,15 +19368,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "Snelwegkruising bewerken"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "Diensten"
@@ -19168,5 +19384,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr "Rustplaats bewerken"
@@ -19174,5 +19390,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -19205,17 +19422,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "Bedrijf"
@@ -19224,5 +19441,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "Verkeerslicht"
@@ -19232,5 +19449,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr "Soort voetgangersoversteekplaats"
@@ -19239,27 +19456,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr "zonder verkeerslichten"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr "verkeerslichten"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "eiland"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr "ongemarkeerd"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr "Als ruiter oversteken"
@@ -19267,6 +19484,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr "Op de fiets oversteken"
@@ -19275,11 +19492,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr "Klaar-over"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -19287,30 +19504,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr "pelicaan"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "Stop"
@@ -19318,5 +19535,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr "Voetgangersoversteekplaats"
@@ -19325,14 +19542,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr "Mini-rotonde"
@@ -19343,14 +19606,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr "Richting"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr "met de klok mee"
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr "Draaicirkel"
@@ -19360,26 +19623,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "Stadsgrens"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "Bord stadsgrens bewerken"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr "Tweede naam"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 msgid "Speed Camera"
 msgstr "Snelheidscamera"
 
 #. 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "Praatpaal"
@@ -19387,5 +19652,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr ""
@@ -19393,5 +19658,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr ""
@@ -19399,11 +19664,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr "Doorwaadplek"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr "Doorwaadplek bewerken"
@@ -19411,5 +19683,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr "Bergpas"
@@ -19417,5 +19689,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr "Bergpas bewerken"
@@ -19427,7 +19699,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "Stijging"
@@ -19435,5 +19707,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Barrières"
@@ -19441,5 +19713,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr "Verkeerspaal"
@@ -19447,5 +19719,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr "Verkeerspaal bewerken"
@@ -19490,16 +19762,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "Toegestaan verkeer:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr ""
@@ -19508,5 +19780,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr "Blok"
@@ -19514,5 +19786,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr "Wildrooster"
@@ -19520,10 +19792,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr "Wildrooster bewerken"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr "Bussluis"
@@ -19531,15 +19803,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr "Pennen"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr "Spijkers bewerken"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "Tolpoort"
@@ -19547,5 +19819,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "Tolpoort bewerken"
@@ -19553,10 +19825,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr "Grenspost"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr "Grenspost bewerken"
@@ -19566,5 +19838,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr "Haag"
@@ -19573,12 +19845,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:817 build/trans_presets.java:819
 msgid "Fence"
 msgstr "Hek"
 
-#. item "Barriers/Fence"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "Muur"
@@ -19586,5 +19870,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "Stadsmuur"
@@ -19593,5 +19877,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr "Stutmuur"
@@ -19603,15 +19887,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr "Ingang"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr "Ingang bewerken"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "Poort"
@@ -19619,50 +19904,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr "Poort bewerken"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr "Slagboom"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr "Slagboom bewerken"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr "Draadhek"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr "Draadhek bewerken"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr "Botspoort"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr "Botspoort bewerken"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr "Sluipdoorhek"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr "Sluipdoorhek bewerken"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr "Overstap"
@@ -19670,25 +19955,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr "Overstap bewerken"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr "Gekoppelde deuren"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr "Gekoppelde deuren bewerken"
@@ -19699,11 +19984,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "Water"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "Bron"
@@ -19711,5 +19996,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "Bron bewerken"
@@ -19717,5 +20002,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr "Sloot"
@@ -19723,10 +20008,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr "Sloot bewerken"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "Stroom"
@@ -19734,10 +20030,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "Stroom bewerken"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "Kanaal"
@@ -19745,10 +20041,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "Kanaal bewerken"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "Rivier"
@@ -19758,5 +20054,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "Rivier bewerken"
@@ -19764,15 +20060,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Water bewerken"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "Land bewerken"
@@ -19780,15 +20076,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr "Estuarium"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr "Estuarium bewerken"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr "Reservoir"
@@ -19796,15 +20092,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr "Reservoir bewerken"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr "Ondergronds reservoir"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr "Ondergronds reservoir bewerken"
@@ -19812,5 +20108,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "Rivierbank"
@@ -19819,10 +20115,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "Rivierbank bewerken"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr "Drasland"
@@ -19833,14 +20129,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr "Drasland bewerken"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "Moeras"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr "veen"
@@ -19854,35 +20150,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr "moeras"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr "rietveld"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr "Zoutwatermoeras"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr "slik"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr "mangroven"
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "Modder"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr "Modder bewerken"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "Strand"
@@ -19890,20 +20186,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "Strand bewerken"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "Baai"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "Baai bewerken"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "Klif"
@@ -19911,10 +20207,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "Klif bewerken"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "Kustlijn"
@@ -19922,5 +20218,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "Kustlijn bewerken"
@@ -19928,5 +20224,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "Veerpontroute"
@@ -19934,5 +20230,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr "Veerpontroute bewerken"
@@ -19941,5 +20237,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr "Scheepswerf"
@@ -19947,10 +20243,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr "Scheepswerf bewerken"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "Dok"
@@ -19958,5 +20254,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr "Dok bewerken"
@@ -19964,5 +20260,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "Dam"
@@ -19970,15 +20266,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "Dam bewerken"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr "Waterwegpunt"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr "Sluis"
@@ -19987,5 +20283,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr "Stuw"
@@ -19993,20 +20289,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr "Stuw bewerken"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "Waterval"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "Waterval bewerken"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr "Zwaaiplaats"
@@ -20015,15 +20311,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr "Jachthaven"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr "Jachthaven bewerken"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "Pier"
@@ -20031,10 +20327,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "Pier bewerken"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr "Veerbootterminal"
@@ -20042,10 +20338,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr "Veerbootterminal bewerken"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr "Trailerhelling"
@@ -20055,20 +20351,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr "Trailerhelling bewerken"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "Spoorweg"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "Spoor"
@@ -20076,5 +20372,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr "Spoor bewerken"
@@ -20083,139 +20379,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr "standaard"
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr "tuin"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr "nevenweg"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr "privéoprit"
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr "spoor"
+
+#. 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:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+msgid "Voltage"
+msgstr "Voltage"
+
+#. 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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr "Smalspoor"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr "Smalspoor bewerken"
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr "Monorail"
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr "Monorail bewerken"
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr "Museumspoor"
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr "Een museumspoorweg bewerken"
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr "Sneltram"
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr "Sneltram bewerken"
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "Metro"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "Metro bewerken"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "Tram"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr "Tram bewerken"
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr "Busbaan"
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr "Busbaan bewerken"
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "Ongebruikt spoor"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "Ongebruikt spoor bewerken"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr "Optionele soorten"
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr "tuin"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr "nevenweg"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr "privéoprit"
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr "Smalspoor"
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr "Smalspoor bewerken"
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr "Monorail"
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr "Monorail bewerken"
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr "Museumspoor"
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr "Een museumspoorweg bewerken"
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr "Sneltram"
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr "Sneltram bewerken"
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "Metro"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "Metro bewerken"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "Tram"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr "Tram bewerken"
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr "Busbaan"
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr "Busbaan bewerken"
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "Ongebruikt spoor"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "Ongebruikt spoor bewerken"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "Verwijderd spoor"
@@ -20224,5 +20759,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr "Bewaakte spoorwegovergang"
@@ -20231,5 +20766,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr "Onbewaakte spporwegovergang"
@@ -20239,5 +20774,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr ""
@@ -20245,5 +20780,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "Draaiplateau"
@@ -20252,10 +20787,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr "Kabelbaan"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "Stoeltjeslift"
@@ -20263,10 +20805,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr "Stoeltjeslift bewerken"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr "Sleeplift"
@@ -20274,10 +20816,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr "Sleeplift bewerken"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "Kabinebaan"
@@ -20285,10 +20827,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "Kabinebaan bewerken"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr ""
@@ -20296,10 +20838,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20307,12 +20849,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr ""
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "Brandstof"
@@ -20322,9 +20877,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Brandstof bewerken"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20378,32 +20990,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "Openingstijden"
@@ -20462,94 +21074,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20561,5 +21249,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20569,5 +21257,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Parkeerplaats bewerken"
@@ -20578,25 +21266,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr "Referentienummer"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "meerlaags"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "oppervlak"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr "ondergronds"
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr ""
@@ -20605,48 +21293,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "Parkeergeld"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr "Gehandicaptenplaats"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "Wasstraat"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "Autowasstraat bewerken"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "Garage"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "Autogarage bewerken"
@@ -20654,5 +21342,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "Verhuur"
@@ -20661,10 +21349,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "Autoverhuur bewerken"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr "Autodelen"
@@ -20672,5 +21360,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr "Autodelen bewerken"
@@ -20678,10 +21366,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "Fietsenstalling bewerken"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr "Capaciteit"
@@ -20690,15 +21378,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "Fietsenverhuur bewerken"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Openbaar vervoer"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -20708,5 +21396,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -20714,5 +21402,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr "UIC-referentie"
@@ -20720,5 +21408,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr "Onbemand station"
@@ -20726,5 +21414,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr "Onbemand station bewerken"
@@ -20732,5 +21420,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "Tramhalte"
@@ -20739,5 +21427,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "Tramhalte bewerken"
@@ -20745,5 +21433,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "Perron"
@@ -20752,5 +21440,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "Perron bewerken"
@@ -20762,5 +21450,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr "Referentie (tracknummer)"
@@ -20768,10 +21456,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr "Gebied"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "Metroingang"
@@ -20780,10 +21468,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "Metroingang bewerken"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr "Rolstoel"
@@ -20792,5 +21480,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "Busstation"
@@ -20799,5 +21487,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "Busstation bewerken"
@@ -20805,5 +21493,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "Bushalte"
@@ -20813,5 +21501,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "Bushalte bewerken"
@@ -20820,25 +21508,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr "Schuilplaats"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "Bank"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr "Busstation"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr "Busplatform bewerken"
@@ -20846,5 +21535,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "Taxi"
@@ -20852,5 +21541,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "Taxistandplaats bewerken"
@@ -20858,32 +21547,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "Luchthaven"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr ""
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr "IATA"
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr "ICAO"
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+msgid "Beacon"
+msgstr "Baken"
+
+#. 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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Accomodatie"
@@ -20895,5 +21679,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -20902,15 +21686,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "Hotel bewerken"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "Sterren"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr "Motel"
@@ -20918,20 +21702,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr "Motel bewerken"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr "Pension"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr "Pension bewerken"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "Chalet"
@@ -20939,10 +21723,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr "Chalet bewerken"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr "Hostel"
@@ -20950,30 +21734,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr "Hostel bewerken"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr "Berghut"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr "Berghut bewerken"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr "Caravanpark"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr "Caravanpark bewerken"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "Kampeerterrein"
@@ -20981,10 +21765,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr "Kampeerterrein bewerken"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Eten en drinken"
@@ -20995,5 +21779,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -21001,5 +21785,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "Restaurant bewerken"
@@ -21007,5 +21791,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr "Keuken"
@@ -21013,61 +21797,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "Italiaanse keuken"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "Chinese keuken"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "Grieks"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "Duits"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "Indiaas"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "lokaal"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr "Kebab"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "Turks"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "Oosters"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "Thais"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "Mexicaans"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "Japans"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -21075,9 +21871,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "Fast-Food-restaurant bewerken"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "Café"
@@ -21085,9 +21889,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "Café bewerken"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "Kroeg"
@@ -21095,18 +21899,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "Kroeg bewerken"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr "Biergarten bewerken"
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr ""
@@ -21114,9 +21918,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "Nachtclub"
@@ -21124,24 +21928,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "Nachtclub bewerken"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Toerisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr "Attractie"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr "Attractie bewerken"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Museum"
@@ -21149,9 +21953,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Museum bewerken"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Dierentuin"
@@ -21160,9 +21964,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Dierentuin bewerken"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "Uitkijkpunt"
@@ -21170,24 +21974,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "Uitkijkpunt bewerken"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr "Uitkijktoren"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "Themapark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr "Themapart bewerken"
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "Kunstwerk"
@@ -21195,5 +21999,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "Kunstwerk bewerken"
@@ -21201,19 +22005,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Kaart"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr ""
@@ -21251,5 +22055,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -21257,28 +22061,28 @@
 msgstr "straat"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr ""
@@ -21288,5 +22092,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr ""
@@ -21294,5 +22098,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr "Wandelen"
@@ -21300,6 +22104,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "Fietsen"
@@ -21307,5 +22111,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr ""
@@ -21313,6 +22117,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "Skiën"
@@ -21320,5 +22124,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr ""
@@ -21326,46 +22130,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "geschiedenis"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr "natuur"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr "Wild"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr ""
@@ -21373,29 +22177,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr "Schuilplaats bewerken"
@@ -21403,25 +22207,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr "Vuurplaats"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "Picnicplek"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "Picnicplek bewerken"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Historische locaties"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Kasteel"
@@ -21430,19 +22234,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Kasteel bewerken"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Ruïne"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Ruïne bewerken"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Archeologische plaats"
@@ -21451,9 +22255,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "Archeologische plaats bewerken"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "Slagveld"
@@ -21461,10 +22265,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "Slagveld bewerken"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr ""
@@ -21472,5 +22276,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -21478,15 +22282,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "Monument bewerken"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "Herdenkingsplek"
@@ -21494,55 +22298,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "Herdenkingsplek bewerken"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr "Kruis langs de weg"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr "Kruis langs de weg bewerken"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr "Kapelletje langs de weg"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr "Kapelletje bewerken"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Vrije tijd"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "Zwembad"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "Zwembad bewerken"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Speelveld"
@@ -21550,35 +22354,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Speelveld bewerken"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Visstek"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "Visstek bewerken"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr "Sportfaciliteiten"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Stadion bewerken"
@@ -21592,6 +22396,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "sport selecteren:"
@@ -21983,6 +22787,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -22016,225 +22820,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr "Meervoudig"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "Boogschieten"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr "Atletiek"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "Australisch football"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "Honkbal"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "Basketball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr "Boules"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr "Bowling"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr "Kanoën"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "Klimmen"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr "Cricket"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr "Cricket netten"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr "Croquet"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "Fietsen"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr "Hondenraces"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr "Paardensport"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "Football"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "Golf"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "Turnen"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "Hockey"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr "Paardenraces"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr "Motorsport"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr "Pelota"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr "Badminton"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr "Rugby"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "Schieten"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr "Skateboarden"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr "Schaatsen"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "Skiën"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "Voetbal"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "Zwemmen"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "Tafeltennis"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "Tennis"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "Sportcentrum"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "Sportcentrum bewerken"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr "Sportveld"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr "Sportveld bewerken"
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr "Wedstrijdbaan"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr "Wedstrijdbaan bewerken"
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "Golfbaan"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "Golfbaan bewerken"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "Minigolf bewerken"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr "Verzameling"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr "Verzameling bewerken"
@@ -22273,21 +23077,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "soort"
@@ -22326,203 +23130,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr "Sportveld"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "Sportcentrum"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "Stadion"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr "Atletiek"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr "Atletiek bewerken"
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "Boogschieten"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "Boogschieten bewerken"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "Klimmen"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "Klimmen bewerken"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr "Kanoën"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr "Kanoën bewerken"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr "Fietsen bewerken"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "Hondenracen"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr "Hondenracen bewerken"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr "Paardenracen"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr "Paardenracen bewerken"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "Turnen"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr "Turnen bewerken"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "Motorracen"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr "Motorracen bewerken"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr "Schaatsen"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr "Schaatsen bewerken"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr "Skateboard bewerken"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "Zwemmen"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "Zwemmen bewerken"
@@ -22530,56 +23334,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr "Skiën bewerken"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr "Soort piste"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr "bergafwaarts"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr "Scandinavisch"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr "Moeilijkheidsgraad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr "beginner"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr "eenvoudig"
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr ""
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "Schieten"
@@ -22587,182 +23387,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "Schieten bewerken"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "Balsporten"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "Voetbal"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr "Voetbal bewerken"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "Football"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr "Football bewerken"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr "Australisch football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr "Australisch football bewerken"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "Honkbal"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr "Honkbal bewerken"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "Basketball bewerken"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr "Golf bewerken"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "golfbaan"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr "Boule bewerken"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr "Bowlen"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr "Bowlen bewerken"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr "Cricket bewerken"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr "Cricketnetten"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr "Cricketnetten bewerken"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr "Croquet bewerken"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "Hockey bewerken"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr "Pelota bewerken"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr "Badminton"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr "Badminton bewerken"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr "Rugby bewerken"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "Tafeltennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "Tafeltennis bewerken"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "Tennis bewerken"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Gebouwen"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "Gebouw"
@@ -22770,5 +23570,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Openbare gebouw"
@@ -22776,10 +23576,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Openbare gebouwen bewerken"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "Stadhuis"
@@ -22787,10 +23587,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Stadhuis bewerken"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Ambassade"
@@ -22798,10 +23598,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Ambassade bewerken"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "Gerechtsgebouw"
@@ -22810,10 +23610,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Gerechtsgebouw bewerken"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Gevangenis"
@@ -22822,10 +23622,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Gevangenis bewerken"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Politie"
@@ -22835,10 +23635,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Politie bewerken"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "Brandweerkazerne"
@@ -22847,10 +23647,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Brandweerkazerne bewerken"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Postkantoor"
@@ -22858,5 +23658,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Postkantoor bewerken"
@@ -22864,15 +23664,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "Kinderopvang"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "Kinderopvang bewerken"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "School"
@@ -22880,10 +23680,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "School bewerken"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "Universiteit"
@@ -22891,10 +23691,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "Universiteit bewerken"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "Campus"
@@ -22902,5 +23702,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "Campus bewerken"
@@ -22908,5 +23708,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Bioscoop"
@@ -22915,10 +23715,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Bioscoop bewerken"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "Bibliotheek"
@@ -22927,9 +23727,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Bibliotheek bewerken"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "Kunstcentrum"
@@ -22937,10 +23737,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "Kunstcentrum bewerken"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Theater"
@@ -22949,10 +23749,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Theater bewerken"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "Religieus gebouw"
@@ -22962,5 +23762,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "Religieus gebouw bewerken"
@@ -22969,6 +23769,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "Religie"
@@ -22977,66 +23777,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr "Bahai"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "Boeddhisme"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "Christelijk"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "Hindoestaans"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr "Jain"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "Joods"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "Moslim"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr "Sikh"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr "Spirtualist"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr "Taoist"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr "Benaming"
@@ -23045,81 +23845,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr "Anglicaan"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "Baptist"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "Katholiek"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr "Evangelist"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr "Jehovahs getuigen"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "Luthers"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr "Methodist"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr "Mormoon"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "Orthodox"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "Protestant"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr "Quaker"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Adressen"
@@ -23128,5 +23928,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Adresinformatie bewerken"
@@ -23134,5 +23934,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "Huisnummer"
@@ -23140,25 +23940,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "Huisnaam"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Straatnaam"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "Stadsnaam"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Postcode"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "Landcode"
@@ -23167,5 +23967,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "Adresinterpolatie bewerken"
@@ -23173,61 +23973,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr "Nummeringschema"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "oneven"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "even"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr "Bouwwerken"
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "Fabriek"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "Fabriek bewerken"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Toren"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Toren bewerken"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr ""
@@ -23235,25 +24035,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Watertoren"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Watertoren bewerken"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "Olieopslag"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "Olieopslag bewerken"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "Vuurtoren"
@@ -23261,10 +24061,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Vuurtoren bewerken"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Windmolen"
@@ -23272,10 +24072,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Windmolen bewerken"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Pijplijn"
@@ -23284,37 +24084,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Pijplijn bewerken"
 
-#: build/trans_presets.java:2198
-msgid "oil"
-msgstr ""
-
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr ""
+
+#: build/trans_presets.java:2353
+msgid "oil"
+msgstr ""
+
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "Afvalzuivering"
@@ -23324,10 +24124,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "Afvalzuivering bewerken"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Kraan"
@@ -23335,21 +24135,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Kraan bewerken"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr "Baken"
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr "Baken bewerken"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "Uitkijkpunt"
@@ -23357,10 +24152,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "Uitkijkpunt bewerken"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "Bewakingscamera"
@@ -23368,11 +24163,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Bewakingscamera bewerken"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "Energievoorziening"
@@ -23382,35 +24189,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "Energievoorziening bewerken"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "water"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "fossiele brandstoffen"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "nucleair"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "kolen"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr "fotovoltage"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "Verdeelstation"
@@ -23419,10 +24226,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "Verdeelstation bewerken"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -23431,5 +24238,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "Transformatorstation bewerken"
@@ -23437,10 +24244,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr "Lijnreferentie"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "Hoogspanningsmast"
@@ -23451,23 +24258,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "Hoogspanningsmast bewerken"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "Hoogspanningskabel"
@@ -23476,79 +24283,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "Hoogspanningskabels bewerken"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr ""
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "Voltage"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr "Voorzieningen"
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Toiletten"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr "Opmerking"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "Postbus"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Telefoon"
@@ -23557,5 +24359,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Een telefoon bewerken"
@@ -23563,5 +24365,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Munten"
@@ -23569,5 +24371,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "Briefgeld"
@@ -23575,5 +24377,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr "Chipknip"
@@ -23581,5 +24383,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr "Pinpas"
@@ -23587,15 +24389,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Creditkaart"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Telefoonkaart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Recycling"
@@ -23604,5 +24406,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Recyclebakken"
@@ -23610,63 +24412,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "Batterijen"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "Flessen"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "Kleding"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "Schroot"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+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:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr ""
@@ -23745,5 +24558,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -23753,31 +24566,31 @@
 msgstr "groen"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr "Vogeluitkijkpost"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr "Vogeluitkijkpost bewerken"
@@ -23786,30 +24599,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "Hoogte"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr "Kruiphoogte"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr "Bukhoogte"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr "Stahoogte"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr "Verborgen"
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr "Afgesloten"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "Fontein"
@@ -23818,10 +24631,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "Fontein bewerken"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "Drinkwater"
@@ -23830,10 +24643,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Drinkwater bewerken"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr ""
@@ -23841,15 +24667,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Winkels"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr ""
@@ -23857,10 +24683,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "Winkel met autoonderdelen bewerken"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr ""
@@ -23869,28 +24695,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "Fietswinkel bewerken"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "Supermarkt bewerken"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr ""
@@ -23898,9 +24724,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -23908,27 +24734,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "Kiosk bewerken"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "Verkoopautomaat"
@@ -23936,5 +24762,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "Verkoopautomaat bewerken"
@@ -23942,88 +24768,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "Producten"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr "vervoerskaarten"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr "overzichtskaart"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr "parkeerbiljet"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "voedsel"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "frisdranken"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "snoepgoed"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "sigaretten"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "foto's"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "diervoeder"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "kranten"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "speelgoed"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "postzegels"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "SIM-kaarten"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr "prepaid-kaarten"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr "tegoedbonnen"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "condooms"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr "hondenpoepzakjes"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr "Klantenkaarten"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "Slager"
@@ -24031,9 +24857,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Slager bewerken"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "Bakker"
@@ -24041,9 +24867,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Bakker bewerken"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "Bloemist"
@@ -24051,18 +24877,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "Bloemist bewerken"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr ""
@@ -24070,54 +24896,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr "Dranken"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr "Computer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "Computerwinkel bewerken"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr "Elektronica"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "Elektronicawinkel bewerken"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr "Hifi-winkel bewerken"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr "Meubels"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "Meubelzaak bewerken"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr "Tuincentrum"
@@ -24125,9 +24951,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr "Tuincentrum bewerken"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr ""
@@ -24135,9 +24961,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "Doe-het-zelfzaak"
@@ -24145,54 +24971,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "Doe-het-zelfzaak bewerken"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr "Kantoorartikelen"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr "Kantoorartikelenwinkel bewerken"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "Kapper"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "Kapper bewerken"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr "Schoenen"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "Schoenenwinkel bewerken"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr "Speelgoed"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "Speelgoedwinkel bewerken"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr "Videotheek"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr "Videotheek bewerken"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Stomerij"
@@ -24200,9 +25026,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Stomerij bewerken"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Wasserette"
@@ -24210,9 +25036,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Wasserette bewerken"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr "Buitensport"
@@ -24220,28 +25046,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr "Buitensportzaak bewerken"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr "Sportzaak bewerken"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "Opticiën bewerken"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Geldzaken"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Bank"
@@ -24249,14 +25075,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Bank bewerken"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "Geldautomaat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Geldwisselkantoor"
@@ -24264,5 +25090,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Geldwisselkantoor bewerken"
@@ -24270,15 +25096,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Geldautomaat bewerken"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Gezondheid"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "Huisarts"
@@ -24286,18 +25112,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "Huisarts bewerken"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "Tandarts"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "Tandarts bewerken"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Apotheek"
@@ -24305,5 +25131,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Apotheek bewerken"
@@ -24311,9 +25137,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Ziekenhuis"
@@ -24321,10 +25147,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Ziekenhuis bewerken"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr "EHBO-post"
@@ -24333,5 +25159,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr "EHBO-post bewerken"
@@ -24340,20 +25166,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr "Puntnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "Telefoonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Gebruik de landtoegangscode, b.v. +31 20-3456789)"
@@ -24361,5 +25187,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "Dierenarts"
@@ -24368,64 +25194,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "Dierenarts bewerken"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Locaties"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Continent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Een continent bewerken"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Land bewerken"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "Provincie"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "Provincie bewerken"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "Regio"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "Regio bewerken"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr ""
@@ -24433,15 +25259,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "Stad"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "Stad bewerken"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "Dorp"
@@ -24449,10 +25275,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "Dorp bewerken"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "Deelgemeente"
@@ -24460,25 +25286,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "Deelgemeente bewerken"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Klein dorp"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Klein dorp bewerken"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "Gehucht"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "Gehucht bewerken"
@@ -24486,5 +25312,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr ""
@@ -24492,10 +25318,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "Eiland"
@@ -24503,10 +25329,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Eiland bewerken"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr ""
@@ -24514,5 +25340,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr ""
@@ -24520,5 +25346,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "Grotingang"
@@ -24526,10 +25352,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "Grotingang bewerken"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Bergtop"
@@ -24537,10 +25363,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Bergtop bewerken"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "Gletsjer"
@@ -24548,10 +25374,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "Gletsjer bewerken"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "Vulkaan"
@@ -24559,70 +25385,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "Vulkaan bewerken"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Grenzen"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "Landsgrens"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "Landsgrens bewerken"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "Provincie -of gemeentegrens"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "Provincie -of gemeentegrens bewerken"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr "Grens bebouwde kom"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr "Grens bebouwde kom bewerken"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "Grens kiesdistrict bewerken"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "Grens Nationaal park bewerken"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Grondgebruik"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Boom"
@@ -24631,15 +25457,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Boom bewerken"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "Botanische naam"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "Bos"
@@ -24648,5 +25474,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "Bos bewerken"
@@ -24654,17 +25480,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "naaldbomen"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "loofbomen"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "gemengd"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "Bosbouw"
@@ -24673,14 +25499,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "Bosbouw bewerken"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "Natuurreservaat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "Natuurreservaat bewerken"
@@ -24688,25 +25514,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr "Puinhelling"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr "Puinhelling bewerken"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr "Kreupelhout"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr "Kreupelhout bewerken"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr ""
@@ -24714,10 +25540,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr "Heide"
@@ -24725,5 +25551,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "Heide bewerken"
@@ -24731,5 +25557,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr "Boerenerf"
@@ -24738,45 +25564,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr "Boerenerf bewerken"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "Landbouwgrond"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr "Landbouwgrond bewerken"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr "Weide"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr "Weideland bewerken"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "Wijngaard"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "Wijngaard bewerken"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr "Volkstuinen"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr "Volkstuinen bewerken"
@@ -24784,25 +25610,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "Tuin"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "Tuin bewerken"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "Gras"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr "Gras bewerken"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr "Stadsgroen"
@@ -24810,10 +25636,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr "Stadsgroen bewerken"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr "Algemeen"
@@ -24821,20 +25647,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr "Algemeen bewerken"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "Park bewerken"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr "Recreatiegebied"
@@ -24842,5 +25668,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr "Recreatiegebied bewerken"
@@ -24848,15 +25674,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "Woongebied"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr "Woongebied bewerken"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "Begraafplaats"
@@ -24864,9 +25690,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Begraafplaats bewerken"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "Begraafplaats"
@@ -24874,39 +25700,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "Begraafplaats bewerken"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "Winkelcentrum"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr "Winkelcentrum bewerken"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "Kantoren"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr "Kantoren bewerken"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "Industrieterrein"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr "Industrieterrein bewerken"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr ""
@@ -24914,15 +25740,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "Militair terrein"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr "Militair terrein bewerken"
@@ -24930,50 +25756,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "Bouwterrein"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "Bouwterrein bewerken"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr "Braakliggende grond"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr "Braakliggende grond bewerken"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr "Ontwikkelingsgebied"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr "Ontwikkelingsgebied bewerken"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr "Vuilstortplaats"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr "Vuilstortplaats bewerken"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "Mijnbouw"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "Mijnbouw bewerken"
@@ -24983,5 +25809,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr "Multipolygoon bewerken"
@@ -24990,10 +25816,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr "buitensegment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr "binnensegment"
@@ -25001,5 +25827,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr "Verkeersbeperking"
@@ -25008,5 +25834,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr "Verkeersbeperking bewerken"
@@ -25014,34 +25840,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr "Beperking"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr "niet linksaf"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr "niet rechtsaf"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr "niet rechtdoor"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr "niet keren"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr "alleen rechtsaf"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr "alleen linksaf"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr "alleen rechtdoor"
@@ -25050,15 +25876,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr "vanaf weg"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr "via knoop of weg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr "naar weg"
@@ -25066,5 +25892,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr ""
@@ -25073,5 +25899,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr ""
@@ -25079,5 +25905,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr ""
@@ -25168,5 +25994,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -25176,17 +26002,17 @@
 msgstr "fiets"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr "straat"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr "veerboot"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr ""
@@ -25246,5 +26072,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -25253,9 +26079,9 @@
 msgstr "voet"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr "omweg"
@@ -25269,10 +26095,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr ""
@@ -25280,31 +26106,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr "Netwerk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr "voorgesteld"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr "alternatief"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr "tijdelijk"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr "verbinding"
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr "Kleur (hex)"
@@ -25313,107 +26139,32 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 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 "standaard"
 
 #. mappaint style named "standard"
@@ -25831,5 +26582,5 @@
 #: build/trans_style.java:490 build/trans_style.java:491
 msgid "barrier"
-msgstr ""
+msgstr "barrière"
 
 #. color barrier
@@ -25949,77 +26700,4 @@
 msgid "highway_track"
 msgstr "snelwegroute"
-
-#. 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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
-msgstr "spoor"
 
 #. color rail
@@ -26407,7 +27085,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "Baptist"
+msgstr ""
 
 #. color manmade
@@ -29546,91 +30223,15 @@
 msgstr "Sicilië - Italië"
 
-#~ msgid "Bridleway"
-#~ msgstr "Ruiterpad"
-
-#~ msgid "Cycleway"
-#~ msgstr "Fietspad"
-
-#~ msgid "Footway"
-#~ msgstr "Voetpad"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Track (klasse 1)"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Klasse-1-track bewerken"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Track (klasse 2)"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Klasse-2-track bewerken"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Track (klasse 3)"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Klasse-3-track bewerken"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Track (klasse 4)"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Klasse-4-track bewerken"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Track (klasse 5)"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Klasse-5-track bewerken"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Wandelen bewerken"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Bergwandelen bewerken"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Bergwandelen (stevig) bewerken"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Bergklimmen bewerken"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Bergklimmen (stevig) bewerken"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Bergklimmen (moeilijk) bewerken"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "Id > 0 benodigd, kreeg {0}"
-
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "Parameter ''{0}'' mag niet null zijn"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "Parameter \"{0}\" mag niet leeg zijn."
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "Verwachtte instantie van OsmDataLaag of GxpLaag. Kreeg \"{0}\"."
-
-#~ msgid ""
-#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
-#~ "This can lead to nodes being deleted accidentally.\n"
-#~ "Are you really sure to continue?"
-#~ msgstr ""
-#~ "Knopen van de geselecteerde weg(gen) liggen buiten het gedownloade "
-#~ "gegevensgebied.\n"
-#~ "Hierdoor kunnen knopen onbedoeld gewist worden.\n"
-#~ "Weet je zeker dat je verder wilt gaan?"
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "Parameter \"{0}\" mag niet leeg zijn"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Tegenstrijdigheden in de gegevens"
+#~ msgid "Select a bookmark first."
+#~ msgstr "Selecteer eerst een bladwijzer."
+
+#~ msgid "Load Selection"
+#~ msgstr "Selectie laden"
+
+#~ msgid "Downloading..."
+#~ msgstr "Downloaden..."
+
+#~ msgid "No images with readable timestamps found."
+#~ msgstr "Geen afbeeldingen met een leesbare tijd gevonden."
 
 #~ msgid "image"
@@ -29638,16 +30239,4 @@
 #~ msgstr[0] "afbeelding"
 #~ msgstr[1] "afbeeldingen"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Selecteer eerst een bladwijzer."
-
-#~ msgid "Load Selection"
-#~ msgstr "Selectie laden"
-
-#~ msgid "Downloading..."
-#~ msgstr "Downloaden..."
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Geen afbeeldingen met een leesbare tijd gevonden."
 
 #~ msgid "Unknown version"
@@ -29936,7 +30525,4 @@
 #~ msgid "Only one node selected"
 #~ msgstr "Slechts één knoop geselecteerd"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Selecteer wegen met nagenoeg rechte hoeken om orthogonaal te maken."
 
 #~ msgid ""
@@ -30093,4 +30679,14 @@
 #~ msgstr "Navigatie"
 
+#~ msgid ""
+#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
+#~ "This can lead to nodes being deleted accidentally.\n"
+#~ "Are you really sure to continue?"
+#~ msgstr ""
+#~ "Knopen van de geselecteerde weg(gen) liggen buiten het gedownloade "
+#~ "gegevensgebied.\n"
+#~ "Hierdoor kunnen knopen onbedoeld gewist worden.\n"
+#~ "Weet je zeker dat je verder wilt gaan?"
+
 #~ msgid "Really mark this issue as ''done''?"
 #~ msgstr "Dit onderwerp zeker als ''uitgevoerd'' markeren?"
@@ -30128,4 +30724,19 @@
 #~ msgid "Validate either current selection or complete dataset."
 #~ msgstr "Valideer de huidige selectie of de totale gegevensset."
+
+#~ msgid "Motorboat"
+#~ msgstr "Motorboot"
+
+#~ msgid "Boat"
+#~ msgstr "Pleziervaart"
+
+#~ msgid "Bridleway"
+#~ msgstr "Ruiterpad"
+
+#~ msgid "Cycleway"
+#~ msgstr "Fietspad"
+
+#~ msgid "Footway"
+#~ msgstr "Voetpad"
 
 #~ msgid "Open the OpenStreetBugs window and activate the automatic download"
@@ -30195,4 +30806,16 @@
 #~ msgstr "aquaduct"
 
+#~ msgid "Edit Hiking"
+#~ msgstr "Wandelen bewerken"
+
+#~ msgid "Edit Mountain Hiking"
+#~ msgstr "Bergwandelen bewerken"
+
+#~ msgid "Edit Demanding Mountain Hiking"
+#~ msgstr "Bergwandelen (stevig) bewerken"
+
+#~ msgid "Edit Alpine Hiking"
+#~ msgstr "Bergklimmen bewerken"
+
 #~ msgid "Drawbridge"
 #~ msgstr "Kabelbrug"
@@ -30297,7 +30920,4 @@
 #~ msgstr "Er bevindt zich geen EXIF-tijd in het bestand \"{0}\"."
 
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Ingevoerde tijd kon niet worden ontleed."
-
 #~ msgid "Login name (email) to the OSM account."
 #~ msgstr "Loginnaam (e-mail) van het OSM-account."
@@ -30346,7 +30966,4 @@
 #~ msgstr "Oberpfalz Geofabrik.de"
 
-#~ msgid "Station"
-#~ msgstr "Station"
-
 #~ msgid "Shop"
 #~ msgstr "Winkel"
@@ -30366,7 +30983,4 @@
 #~ msgid "bicyclemap"
 #~ msgstr "fietskaart"
-
-#~ msgid "board"
-#~ msgstr "bord"
 
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
@@ -30396,9 +31010,21 @@
 #~ msgstr "Syncroniseer tijd met GPS-apparaat"
 
+#~ msgid "Track Grade 1"
+#~ msgstr "Track (klasse 1)"
+
+#~ msgid "Track Grade 2"
+#~ msgstr "Track (klasse 2)"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "Track (klasse 3)"
+
+#~ msgid "Track Grade 4"
+#~ msgstr "Track (klasse 4)"
+
+#~ msgid "Track Grade 5"
+#~ msgstr "Track (klasse 5)"
+
 #~ msgid "Selected makes your trace public in openstreetmap.org"
 #~ msgstr "Indien geselecteerd wordt je spoor openbaar in openstreetmap.org"
-
-#~ msgid "Public"
-#~ msgstr "Openbaar"
 
 #~ msgid "Download Image from french Cadastre WMS"
@@ -30516,4 +31142,25 @@
 #~ "of gedownload?"
 
+#~ msgid "Edit Track of grade 1"
+#~ msgstr "Klasse-1-track bewerken"
+
+#~ msgid "Edit Track of grade 2"
+#~ msgstr "Klasse-2-track bewerken"
+
+#~ msgid "Edit Track of grade 3"
+#~ msgstr "Klasse-3-track bewerken"
+
+#~ msgid "Edit Track of grade 4"
+#~ msgstr "Klasse-4-track bewerken"
+
+#~ msgid "Edit Track of grade 5"
+#~ msgstr "Klasse-5-track bewerken"
+
+#~ msgid "Edit Demanding Alpine Hiking"
+#~ msgstr "Bergklimmen (stevig) bewerken"
+
+#~ msgid "Edit Difficult Alpine Hiking"
+#~ msgstr "Bergklimmen (moeilijk) bewerken"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Kabelbrug bewerken"
@@ -30540,4 +31187,7 @@
 #~ msgstr "parameter '{0}' mag niet leeg zijn"
 
+#~ msgid ">"
+#~ msgstr ">"
+
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
@@ -30547,4 +31197,7 @@
 #~ "is {1}"
 
+#~ msgid "Conflicts in data"
+#~ msgstr "Tegenstrijdigheden in de gegevens"
+
 #~ msgid "No data"
 #~ msgstr "Geen gegevens"
@@ -30556,4 +31209,7 @@
 #~ msgstr "Help-pagina ontbreekt. Maak het in <A HREF=\"{0}\">nederlands</A>."
 
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "Parameter \"{0}\" mag niet leeg zijn."
+
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Kan \"{0}\" niet lezen"
@@ -30565,4 +31221,7 @@
 #~ msgstr "Upload naar OSM API gefaald"
 
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "Parameter ''{0}'' mag niet null zijn"
+
 #~ msgid "Always move and don't show dialog again"
 #~ msgstr "Altijd verplaatsen en dialoogvenster niet meer laten zien"
@@ -30574,6 +31233,15 @@
 #~ msgstr "Error tijdens het communiceren met de server."
 
+#~ msgid "Id > 0 required, got {0}"
+#~ msgstr "Id > 0 benodigd, kreeg {0}"
+
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr "Verwachtte instantie van OsmDataLaag of GxpLaag. Kreeg \"{0}\"."
+
 #~ msgid "Updating primitive"
 #~ msgstr "Aanpassen primitief"
+
+#~ msgid "Parameter ''{0}'' must not be empty"
+#~ msgstr "Parameter \"{0}\" mag niet leeg zijn"
 
 #~ msgid "At least one object to delete requird, got empty collection"
Index: applications/editors/josm/i18n/po/pl.po
===================================================================
--- applications/editors/josm/i18n/po/pl.po	(revision 19689)
+++ applications/editors/josm/i18n/po/pl.po	(revision 19698)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 23:20-0500\n"
-"PO-Revision-Date: 2010-01-18 11:24-0500\n"
-"Last-Translator: Yarl <carebone@gmail.com>\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-26 01:05+0000\n"
+"Last-Translator: lesi <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-01-13 18:26+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
@@ -74,11 +74,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -98,5 +98,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:429
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
-msgstr ""
+msgstr "Parametr \"downloadgsp\" nie przyjmuje nazw plików lub adresów URL"
 
 #: ../core/src/org/openstreetmap/josm/Main.java:497
@@ -192,4 +192,7 @@
 "page for OSM primitive will probably fail. API base URL is: ''{0}''"
 msgstr ""
+"UWAGA: nieznany format adresu URL API. Przekierowanie do strony "
+"informacyjnej lub historii obiektu OSM najprawdopodobniej zakończy się "
+"niepowodzeniem. Adres URL API to: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63
@@ -239,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -251,13 +254,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -266,5 +269,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -274,5 +280,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:100
 msgid "Click to abort launching external browsers"
-msgstr ""
+msgstr "Kliknij aby anulować uruchomienie zewnetrznych przeglądarek"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:132
@@ -290,5 +296,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Połącz"
@@ -319,5 +325,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -365,17 +371,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:223
 msgid "Please enter a valid latitude in the range -90..90"
-msgstr ""
+msgstr "Wprowadź prawidłową szerokość geograficzną z zakresu -90..90 stopni"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:226
 msgid "Please enter a latitude in the range -90..90"
-msgstr ""
+msgstr "Wprowadź szerokość geograficzną z zakresu -90..90 stopni"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:234
 msgid "Please enter a valid longitude in the range -180..180"
-msgstr ""
+msgstr "Wprowadź prawidłową długość geograficzną z zakresu -180..180 stopni"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:237
 msgid "Please enter a longitude in the range -180..180"
-msgstr ""
+msgstr "Wprowadź długość geograficzną z zakresu -180..180 stopni"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:273
@@ -384,9 +390,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -394,5 +400,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "OK"
@@ -400,5 +408,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274
 msgid "Close the dialog and create a new node"
-msgstr ""
+msgstr "Zamknij okno i utwórz nowy węzeł"
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287
@@ -443,6 +451,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -460,5 +468,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -467,11 +475,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -508,5 +516,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "konflikt"
@@ -518,9 +526,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37
 msgid "previous"
-msgstr ""
+msgstr "poprzedni"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38
 msgid "next"
-msgstr ""
+msgstr "następny"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
@@ -554,10 +562,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/ChangesetManagerToggleAction.java:32
 msgid "Changeset Manager"
-msgstr ""
+msgstr "Menedżer zestawów zmian"
 
 #: ../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 ""
+msgstr "Przełącza wyświetlanie menedżera zestawów zmian"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:34
@@ -641,14 +649,14 @@
 msgstr "Wybierz co najmniej dwie drogi do połączenia."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Kopiuje zaznaczone obiekty do schowka."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Proszę wybrać coś do skopiowania."
@@ -681,8 +689,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -691,5 +699,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -739,5 +747,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:44
 msgid "Download parent ways/relations..."
-msgstr ""
+msgstr "Pobierz nadrzędne drogi/relacje..."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:43
@@ -748,18 +756,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Wystąpił/o {0} koflikt/ów podczas importu."
-msgstr[1] "Wystąpił/o {0} koflikt/ów podczas importu."
-msgstr[2] "Wystąpił/o {0} koflikt/ów podczas importu."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "Konflikty podczas pobierania."
-msgstr[1] "Konflikty podczas pobierania."
-msgstr[2] "Konflikty podczas pobierania."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -780,4 +785,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -787,4 +794,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Powiela zaznaczone obiekty."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Powiel"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "Przesuń aktualnie zaznaczonych członkół w górę"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "Warstwa: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "Pokaż {0}"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr ""
 
 #. <button label="Info" hotkey="I">
@@ -804,5 +839,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java:30
 msgid "Fullscreen View"
-msgstr ""
+msgstr "Pełny ekran"
 
 #. no icon
@@ -875,11 +910,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 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] "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."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -896,9 +929,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:70
 msgid "Please abort if you are not sure"
-msgstr ""
+msgstr "Przerwij jeśli nie jesteś pewien"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
 msgid "No intersection found. Nothing was changed."
-msgstr ""
+msgstr "Brak części wspólnej. Nic nie zmieniono."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
@@ -942,5 +975,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:474
 msgid "Removed Element from Relations"
-msgstr ""
+msgstr "Usuń Element z Relacji"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:598
@@ -950,5 +983,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:614
 msgid "Closed Way"
-msgstr ""
+msgstr "Droga zamknięta"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:902
@@ -979,24 +1012,24 @@
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
 msgid "Jump To Position"
-msgstr ""
+msgstr "Skok do Pozycji"
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:31
 msgid "Opens a dialog that allows to jump to a specific location"
-msgstr ""
+msgstr "Otwiera okno umożliwiające skok do wybranej pozycji"
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:57
 msgid "Enter Lat/Lon to jump to position."
-msgstr ""
+msgstr "Wpisz Szerokość/Długość żeby przejść do pozycji"
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59
 msgid "You can also paste an URL from www.openstreetmap.org"
-msgstr ""
+msgstr "MOżesz też wklejić adres url z www.openstreetmap.org"
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91
 msgid "Zoom (in metres)"
-msgstr ""
+msgstr "Zbliżenie (w metrach)"
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr ""
@@ -1146,6 +1179,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
-msgstr ""
+#, fuzzy
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
+msgstr "<html>Nie można otworzyć katalogu.<br>Proszę wybrać plik!"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:121
@@ -1158,10 +1192,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Otwieram pliki"
-msgstr[1] "Otwieram pliki"
-msgstr[2] "Otwieram pliki"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1213,11 +1246,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:109
 msgid "Download Data"
-msgstr ""
+msgstr "Pobierz dane"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1231,5 +1264,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "Przesuwa węzły tak aby wszystkie kąty miały 90 lub 270 stopni"
 
@@ -1267,4 +1301,8 @@
 "efektów przy wyrównywaniu obiektów.<br>Zmień projekcję aby usunąć to "
 "ostrzeżenie.<br>Kontynuujesz?</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+msgid "Selection must consist only of ways and nodes."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
@@ -1280,4 +1318,16 @@
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr ""
+"Wybierz drogi o kątach prawie prostych aby skorygować ich prostopadłość."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1383,18 +1433,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1419,12 +1469,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Błąd"
@@ -1558,5 +1609,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1757,10 +1808,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "Rozmnóż {0} wezłów w {1} węzłów"
-msgstr[1] "Rozmnóż {0} wezłów w {1} węzłów"
-msgstr[2] "Rozmnóż {0} wezłów w {1} węzłów"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1804,5 +1854,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr ""
@@ -1830,14 +1880,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:89
 msgid "Update selection"
-msgstr ""
+msgstr "Pobierz wybrane"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87
 msgid ""
 "Updates the currently selected objects from the server (re-downloads data)"
-msgstr ""
+msgstr "Pobiera aktualnie wybrane obiekty z serwera"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
 msgid "There are no selected objects to update."
-msgstr ""
+msgstr "Nie wybrano opiektów do pobrania"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:125
@@ -1848,9 +1898,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:86
 msgid "Upload data"
-msgstr "Wysyłam dane"
+msgstr "Wyślij dane"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:85
 msgid "Upload all changes in the active data layer to the OSM server"
-msgstr ""
+msgstr "Wyślij wszystkie zmiany z aktywnej warstwy danych do serwera OSM"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:108
@@ -2057,5 +2107,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:165
 msgid "Click to abort and to resume editing"
-msgstr ""
+msgstr "Kliknij żeby anulować i powrócić do edycji"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
@@ -2085,5 +2135,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java:114
 msgid "Errors during download"
-msgstr ""
+msgstr "Błędy w czasie pobierania"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:94
@@ -2220,6 +2270,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2300,7 +2350,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
-#, fuzzy
 msgid "<not>"
-msgstr "północ"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
@@ -2342,5 +2391,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Szukaj obiektów"
@@ -2358,5 +2407,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84
 msgid "Enter the search expression"
-msgstr ""
+msgstr "Wpisz wyrażenie do wyszukania"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
@@ -2409,7 +2458,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
-#, fuzzy
 msgid "<b>-name:Bak</b> - not ''Bak'' in the name."
-msgstr "<b>-name:Bak</b> - brak ''Bak'' w nazwie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
@@ -2526,5 +2574,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Szukaj"
@@ -2564,12 +2612,11 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "S"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
@@ -2577,10 +2624,10 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2590,9 +2637,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2611,5 +2658,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:634
 msgid "Missing parameter for OR"
-msgstr ""
+msgstr "Brak parametru dla OR"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
@@ -2687,5 +2734,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
 msgid "Cyclic dependency between relations:"
-msgstr ""
+msgstr "Zapętlone zależności między relacjami"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
@@ -2707,5 +2754,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
 msgid "Cycling dependencies"
-msgstr ""
+msgstr "Zapętlone zależności."
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:66
@@ -2725,10 +2772,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "Zmień {0} obiekt"
-msgstr[1] "Zmień {0} obiekty"
-msgstr[2] "Zmień {0} obiektów"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2778,12 +2824,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "Usuń \"{0}\" dla {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Ustaw {0}={1} dla {2} {3}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2841,17 +2887,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Tryb kasowania"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Zmień drogę {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Usuń z relacji"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2932,10 +2978,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "Zmień {0} obiekt"
-msgstr[1] "Zmień {0} obiekty"
-msgstr[2] "Zmień {0} obiektów"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -2983,10 +3028,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "Undelete {0} primitive"
 msgid_plural "Undelete {0} primitives"
-msgstr[0] "usunięte, bądź przesunięte elementy"
-msgstr[1] "usunięte, bądź przesunięte elementy"
-msgstr[2] "usunięte, bądź przesunięte elementy"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
@@ -3001,7 +3045,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Na pewno usunąć zaznaczenie z relacji {0}?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3013,5 +3057,5 @@
 #, java-format
 msgid "Main dataset does not include node {0}"
-msgstr ""
+msgstr "Główny zbiór danych nie zawiera węzła {0}"
 
 #: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
@@ -3085,10 +3129,10 @@
 #, java-format
 msgid "Illegal latitude value ''{0}''"
-msgstr ""
+msgstr "Niewłaściwa wartość szerokości geograficznej \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:77
 #, java-format
 msgid "Illegal longitude value ''{0}''"
-msgstr ""
+msgstr "Niewłaściwa wartość długości geograficznej \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
@@ -3122,4 +3166,6 @@
 "preference directory: {0}"
 msgstr ""
+"Ostrzeżenie: Nie można zainicjować ustawień. Nie udało się utworzyć "
+"brakującego katalogu ustawień: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
@@ -3129,4 +3175,6 @@
 "preference directory: {0}</html>"
 msgstr ""
+"<html>Nie można zainicjować ustawień. <br>Nie udało się utworzyć brakującego "
+"katalogu ustawień: {0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
@@ -3135,4 +3183,5 @@
 "Warning: Missing preference file ''{0}''. Creating a default preference file."
 msgstr ""
+"Ostrzeżenie: Brak pliku ustawień''{0}''. Tworzenie pliku ustawień domyślnych."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
@@ -3142,4 +3191,6 @@
 "file."
 msgstr ""
+"Ostrzeżenie: Zamiana istniejącego pliku ustawień \"{0}\" na plik ustawień "
+"domyślnych."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
@@ -3149,4 +3200,6 @@
 "to default: {0}</html>"
 msgstr ""
+"<html> Nie można zainicjować ustawień . <br> udało się przywrócić pliku "
+"ustawień domyślnych: {0} </ html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
@@ -3156,4 +3209,6 @@
 "<br> and creating a new default preference file.</html>"
 msgstr ""
+"<html>Plik ustawień  zawiera błędy. <br> Tworzenie kopii zapasowej starego "
+"<br> {0} <br> i tworzenia nowego pliku ustawień domyślnych.</ html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
@@ -3163,4 +3218,6 @@
 "default: {0}"
 msgstr ""
+"Ostrzeżenie: Nie można zainicjować ustawień.\r\n"
+"Nie udało się przywrócić pliku ustawień domyślnych: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
@@ -3248,30 +3305,26 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
-msgstr "S"
+msgstr ""
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
-msgstr "N"
+msgstr ""
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
-msgstr "W"
+msgstr ""
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
-msgstr "E"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:207
@@ -3347,8 +3400,7 @@
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "WC"
+msgstr ""
 
 #. column header: inverted filter
@@ -3389,19 +3441,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+msgstr "Oczekiwano ID > 0. Jest {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3410,5 +3462,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3416,5 +3468,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3492,7 +3544,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:327
-#, fuzzy
 msgid "The \"to\" way does not start or end at a \"via\" node."
-msgstr "Wybrana droga nie zawiera wybranego węzła."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
@@ -3538,6 +3589,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3548,5 +3599,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3558,7 +3609,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3581,5 +3632,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "tło"
@@ -3723,6 +3774,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3730,37 +3781,38 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "niekompletne"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "droga"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "tory kolejowe"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "szlak wodny"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "zagospodarowanie przestrzenne"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3770,10 +3822,10 @@
 msgstr[2] "{0} węzłów"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3783,5 +3835,5 @@
 msgstr[2] "{0} elementów"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3818,6 +3870,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Konflikt"
@@ -3828,7 +3880,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-#, fuzzy
-msgid "Authorization Failed"
-msgstr "Połączenie nie powiodło się."
+msgid "Authorisation Failed"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
@@ -4025,5 +4076,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Inicjalizacja"
@@ -4064,5 +4114,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4073,5 +4123,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Edycja"
@@ -4142,29 +4192,29 @@
 msgstr "skala"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Długość 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 name of the object at the mouse pointer."
 msgstr "Nazwa obiektu wskazywanego przez kursor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Szerokość geograficzna punktu wskazywanego przez kursor."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 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:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Namiar (kompasowy) tworzonego odcinka."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 msgid "The length of the new way segment being drawn."
 msgstr "Długość nowego, tworzonego odcinka."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4172,9 +4222,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(brak obiektu)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4334,10 +4384,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "konflikt"
-msgstr[1] "konflikt"
-msgstr[2] "konflikt"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
@@ -4347,5 +4396,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
@@ -4400,16 +4448,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4605,8 +4653,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr "Scala wybrane węzły z najstarszym."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4641,5 +4693,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
@@ -4657,5 +4708,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
@@ -4756,5 +4806,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr ""
@@ -4800,5 +4850,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -4928,10 +4983,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "wszystkie"
@@ -4961,7 +5016,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-#, fuzzy, java-format
+#, java-format
 msgid "Tag collection does not include the selected value ''{0}''."
-msgstr "Wybrana droga nie zawiera wybranego węzła."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
@@ -5011,7 +5066,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -5022,6 +5077,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5202,10 +5257,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5225,18 +5280,18 @@
 msgstr "Historia poleceń: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Rozwiąż"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5268,8 +5323,9 @@
 msgid ""
 "<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions won't be applied unless all differences<br>are "
-"resolved.Click <strong>{0}</strong> to close anyway."
-"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<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 ""
 
@@ -5292,5 +5348,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5299,5 +5355,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5377,43 +5433,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Warstwy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 msgid "Open a list of all loaded layers."
 msgstr "Otwiera listę wszystkich wczytanych warstw."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Pokaż/Ukryj"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Powielone węzły drogi"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 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:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Przesuwa wybraną warstwę o jedno odczo do dołu."
@@ -5427,6 +5488,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Relacje"
@@ -5436,69 +5497,69 @@
 msgstr "Otwiera listę wszystkich relacji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relacje: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Otwiera okno edycji dla zaznaczonej relacji."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Usuwa zaznaczoną relację."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Utwórz nową relację"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Bieżące zaznaczenie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Otwiera okno z listą zaznaczonych obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Powiększ do wybranych elementów"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Powiększ do zaznaczenia"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Zazn.: Rel.:{0} / Drogi:{1} / Węzły:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5506,5 +5567,5 @@
 msgstr "Zaznaczenie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5769,5 +5830,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331
@@ -5857,8 +5917,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -5930,4 +5988,7 @@
 #. <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 />
@@ -6006,6 +6067,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6047,6 +6109,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6515,152 +6579,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Nazwa"
@@ -7043,5 +7109,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<różne>"
@@ -7098,55 +7164,55 @@
 msgstr "Dodaj właściwości"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Właściwości: {0} / członkostwo: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Właściwości / członkostwo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Zmień relację"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "Usuń z relacji"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Na pewno usunąć zaznaczenie z relacji {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Usuń wybrany klucz ze wszystkich obiektów."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "Usuń właściwość"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Dodaj nową parę nazwa/wartość do wszystkich obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Edytuj wartość wybranego klucza dla wszystkich obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7186,5 +7252,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:345
@@ -7468,5 +7533,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
@@ -7569,8 +7633,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr "Zignorowałem wyjątek {0} ponieważ całe pobieranie zostało anulowane."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
@@ -7590,47 +7654,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Zakładki"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../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:187
+#: ../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:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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:212
+#: ../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:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr ""
@@ -7754,18 +7817,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -7776,34 +7839,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
 msgid "Enter a place name to search for:"
 msgstr "Wpisz nazwę miejsce do odnalezienia:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+#: ../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:147
+#: ../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:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr ""
@@ -7814,7 +7877,9 @@
 #. 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" />
@@ -7823,10 +7888,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Rodzaj"
@@ -7835,5 +7901,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -7845,17 +7911,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "nieznany"
@@ -8200,5 +8265,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr "Wykryto konflikty"
@@ -8563,5 +8628,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
@@ -8620,5 +8684,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500
@@ -8641,9 +8704,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8653,7 +8716,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -8665,16 +8728,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "Warstwa"
@@ -9087,68 +9150,68 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "punkt GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Dostosuj rysowanie linii"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../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:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Dostosuj kolor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Domyślny"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Wybierz kolor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr "Znaczniki nazwanych punktów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Nazwane punkty GPS z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Importuj dźwięk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9158,23 +9221,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Pliki audio Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Markery audio z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Importuj obrazki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9184,5 +9247,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9190,5 +9253,5 @@
 msgstr "Nazwa: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9196,5 +9259,5 @@
 msgstr "Opis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9204,23 +9267,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "Opis"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Długość: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9230,5 +9293,5 @@
 msgstr[2] "{0} tras, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9238,10 +9301,10 @@
 msgstr[2] "{0} punktów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Przekształć w warstwę danych"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9251,43 +9314,43 @@
 "za niebezpieczne.<br>Jeśli chcesz wysłać same ślady zajrzyj tu:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Przekonwertowany z: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "Pobierz dane OSM wzdłuż tej ścieżki"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Pobierz wszystko pomiędzy:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metrów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "Maksymalny obszar na zapytanie:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km kw."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9298,5 +9361,5 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
@@ -9304,5 +9367,5 @@
 "danymi dźwiękowymi."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9310,5 +9373,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9316,23 +9379,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Warstwa danych {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "poza pobranym obszarem"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9341,5 +9404,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9353,5 +9416,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9364,11 +9427,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9377,32 +9440,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "Obiekty na warstwie {0}:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9453,28 +9516,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "Punkty GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Pliki GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Błąd podczas przetwarzania {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Nie można odczytać \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9483,34 +9545,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "Brak daty"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr "Otwórz inne zdjęcie"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9520,64 +9582,64 @@
 "Proszę użyć wybranego formatu."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "Nieprawidłowa data"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr "Scieżka GPX: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr "Strefa czasowa: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9586,47 +9648,46 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr "Nieprawidłowa strefa czasowa"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9635,5 +9696,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9641,41 +9702,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 msgid "The selected photos do not contain time information."
-msgstr "Wybrana droga nie zawiera wybranego węzła."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
 "one."
-msgstr "Wybrana droga nie zawiera wybranego węzła."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9684,5 +9743,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9691,64 +9750,63 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "Pobieranie lokalizacji GPS z EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Wczytywanie {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Przeglądanie katalogu {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, 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:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Geolokalizowane obrazy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "Nie wczytano żadnych danych."
-msgstr[1] "Nie wczytano żadnych danych."
-msgstr[2] "Nie wczytano żadnych danych."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -9756,12 +9814,11 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -9770,5 +9827,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -9865,5 +9922,5 @@
 msgstr "znacznik GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -9872,5 +9929,5 @@
 msgstr[2] "znaczników"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -9880,29 +9937,29 @@
 msgstr[2] "{0} składa się z {1} markerów"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "Synchronizacja dźwięku"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 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:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr "Dźwięk zsynchronizowany w punkcie {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -9910,17 +9967,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Pokaż/Ukryj Tekst/Ikony"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 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:171
+#: ../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 "
@@ -9928,5 +9985,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -9934,5 +9991,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "Nie można utworzyć nowego znacznika dźwiękowego."
@@ -9958,5 +10015,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
 #, java-format
 msgid ""
@@ -9964,5 +10021,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
 #, java-format
 msgid ""
@@ -10014,8 +10071,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize URL:"
-msgstr "Autor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10105,8 +10160,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize now"
-msgstr "Autor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10165,7 +10218,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
-#, fuzzy
 msgid "OAuth authorization failed"
-msgstr "Połączenie nie powiodło się."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
@@ -10245,8 +10297,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
-#| msgid "Please select at least four nodes."
 msgid "Please select an authorization procedure: "
-msgstr "Wybierz co najmniej cztery węzły."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10256,8 +10306,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
-#, fuzzy
-#| msgid "Close dialog and cancel downloading"
 msgid "Close the dialog and cancel authorization"
-msgstr "Zamknij okno i porzuć pobieranie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
@@ -10572,5 +10620,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Proszę wybrać wiersz do edycji"
@@ -10584,5 +10632,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10719,9 +10767,4 @@
 msgstr "Styl rysowania {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "Warstwa: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -10751,6 +10794,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr "wszystkie"
@@ -10789,8 +10832,8 @@
 msgstr ""
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Samochód"
@@ -10812,13 +10855,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Rowery"
@@ -10851,12 +10894,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "Ruch pieszy"
@@ -11822,5 +11865,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -11828,18 +11878,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "Dodatkowe atrybuty:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr "zamknięta droga"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Nieznany typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -11850,16 +11900,16 @@
 msgstr "Nie można odczytać źródła szablonów: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Błąd podczas przetwarzania {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, 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:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -11869,18 +11919,17 @@
 msgstr[2] "Zmień {0} obiektów"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "Nic nie wybrano!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "Nieodpowiednie zaznaczenie."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "Zastosuj szablon"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Zmień właściwości"
@@ -12156,6 +12205,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12180,9 +12229,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Błąd parsowania: błędna struktura dokumentu gpx"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12205,7 +12254,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
@@ -12277,5 +12332,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "Liczba wczytanych współrzędnych: "
@@ -12376,10 +12431,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Zmień {0} obiekt"
-msgstr[1] "Zmień {0} obiekty"
-msgstr[2] "Zmień {0} obiektów"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -12912,5 +12966,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
@@ -13008,5 +13061,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -13014,7 +13067,6 @@
 "Plugin {0} requires {1} plugins which were not found. The missing plugins "
 "are:"
-msgstr[0] "Nie znaleziono wtyczki {0} wymaganej przez wtyczkę {1}."
-msgstr[1] "Nie znaleziono wtyczki {0} wymaganej przez wtyczkę {1}."
-msgstr[2] "Nie znaleziono wtyczki {0} wymaganej przez wtyczkę {1}."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13087,5 +13139,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:567
@@ -13283,5 +13334,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13289,8 +13339,4 @@
 "file a bug report."
 msgstr ""
-"W programie wystąpił nieoczekiwany błąd.\n"
-"\n"
-"Taki błąd jest zawsze błędem programisty. Jeżeli korzystasz\n"
-"z najnowszej wersji JOSM, rozważ proszę możliwość zgłoszenia błędu."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13382,6 +13428,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -13498,6 +13544,6 @@
 "Nie udało się odnaleźć tłumaczenia dla języka: {0}. Użyty zostanie {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13506,5 +13552,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -13652,4 +13698,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr ""
@@ -13740,5 +13787,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "Interpolacja adresów"
@@ -14317,5 +14364,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr ""
@@ -14472,21 +14519,21 @@
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr ""
@@ -14518,9 +14565,9 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -14535,13 +14582,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr ""
@@ -14550,6 +14597,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr ""
@@ -14775,17 +14822,17 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../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:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -14829,42 +14876,41 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "wschód"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "północny-wschód"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "północ"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "północny-zachód"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "zachód"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "południowy-zachód"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "południe"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "południowy-wschód"
@@ -14920,6 +14966,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -14928,73 +14974,73 @@
 msgstr "woda"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "linia brzegowa"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "ląd"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../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:43
+#: ../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:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../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:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Rozmiar kafli Landsat (w pikselach)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../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:55
+#: ../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:57
+#: ../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:59
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
 msgid "Tag ways as"
 msgstr "Oznacz drogi jako"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr "Warstwa WMS"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr "Maksymalny rozmiar pamięci podręcznej (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
 msgid "Maximum cache age (days)"
 msgstr "Maksymalny wiek pamięci podręcznej (dni)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:68
 msgid "Source text"
 msgstr "Tekst źródłowy"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -15002,5 +15048,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -15008,5 +15054,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -15014,58 +15060,58 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../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:79
+#: ../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:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../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:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr ""
@@ -15089,5 +15135,5 @@
 msgstr "Połączenie nie powiodło się"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr ""
@@ -15118,5 +15164,5 @@
 msgstr "Kurs"
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr ""
@@ -15190,5 +15236,5 @@
 msgstr "Kąt pomiędzy dwoma wybranymi węzłami"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr ""
@@ -15452,4 +15498,75 @@
 msgid "Firefox executable"
 msgstr "Ścieżka do programu Firefox"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#, fuzzy
+msgid "Read error!"
+msgstr "sztuczne jezioro"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Podaj współrzędne nowego węzła."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Pozostawiaj kopie zapasowe plików"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Błąd"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "Podany czas nie został rozpoznany."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Nie mogłem przemianować pliku ''{0}''"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Pozostawiaj kopie zapasowe plików"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "Pozostawiaj kopie zapasowe plików"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Zastąp"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+msgid "Could not delete temporary file!"
+msgstr ""
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
@@ -15722,6 +15839,6 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -15843,72 +15960,127 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+msgid "Terrace a house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+msgid "Interpolation"
+msgstr "Interpolacja"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Sieć drogowa"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Największy numer"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Najmniejszy numer"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+msgid "Lowest housenumber of the terraced house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Utwórz nową relację"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Usuwanie węzłów lub dróg."
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Nazwa ulicy"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr "Najmniejszy numer"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr "Największy numer"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../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:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr ""
@@ -16143,5 +16315,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr ""
@@ -16151,5 +16323,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16161,9 +16333,9 @@
 "węzłów.<br>Czy naprawdę zamierzasz je usunąć?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr ""
@@ -16198,5 +16370,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr ""
@@ -16342,7 +16514,7 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -16350,80 +16522,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr "DO POPRAWKI"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16431,86 +16603,86 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -16952,5 +17124,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -16961,63 +17133,63 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+msgid "Download visible tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
-msgid "Download visible tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "Zmiana rozdzielczości"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+msgstr "Wczytaj ponownie błędne kafle"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr "Błędny format pliku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "Błąd podczas ładowania pliku"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -17268,6 +17440,13 @@
 msgstr ""
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17276,15 +17455,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17293,10 +17472,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17305,15 +17484,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17323,10 +17502,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17335,5 +17514,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17344,10 +17523,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -17454,6 +17633,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -17461,6 +17649,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "Numer"
@@ -17477,5 +17666,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Liczba pasów ruchu"
@@ -17497,10 +17686,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Max. prędkość (km/h)"
@@ -17544,14 +17733,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "jednokierunkowa"
@@ -17594,13 +17783,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -17638,13 +17827,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "tunel"
@@ -17679,13 +17868,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "wykop"
@@ -17720,13 +17909,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "nasyp"
@@ -17858,4 +18047,13 @@
 msgid "Edit Unclassified Road"
 msgstr "Edycja drogi gminnej lub innej drogi publicznej"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr ""
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -17873,15 +18071,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr "Szerokość (w metrach)"
@@ -17893,5 +18091,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "droga lokalna"
@@ -17900,5 +18098,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "Edycja drogi lokalnej / ulicy"
@@ -17916,16 +18114,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Nawierzchnia"
@@ -17947,166 +18148,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "Las naturalny"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr "bruk"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "żwir"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "trawa"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "piach"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr "grunt"
@@ -18114,5 +18322,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr "strefa zamieszkania"
@@ -18121,5 +18329,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr "Edycja strefy zamieszkania"
@@ -18127,5 +18335,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "ciąg pieszy"
@@ -18134,5 +18342,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "Edycja ciągu pieszego"
@@ -18140,5 +18348,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr "droga serwisowa"
@@ -18147,5 +18355,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr "Edycja drogi serwisowej"
@@ -18155,18 +18363,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr "Alejka"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr "podjazd"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr "wysepka parkignowa"
@@ -18174,5 +18382,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr "uliczka parkingowa"
@@ -18182,5 +18390,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr "Edycja uliczki parkingowej"
@@ -18188,5 +18396,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "droga (nieokreślona)"
@@ -18195,5 +18403,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "Edycja drogi nieokreślonego rodzaju"
@@ -18202,20 +18410,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "ograniczenia na drodze"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "Edycja ograniczeń na drodze"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "bramka (opłata)"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "ślepa ulica"
@@ -18223,9 +18431,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 msgid "Access"
 msgstr "Dostęp do drogi"
 
 #. 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"
@@ -18236,6 +18445,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18247,4 +18454,5 @@
 #. 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"
@@ -18263,141 +18471,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+msgid "yes"
+msgstr "tak"
+
+#. 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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "droga prywatna"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+msgstr "dla wyznaczonych pojazdów"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:219
+msgid "destination"
+msgstr "dojazd do posesji"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr "dopuszczalny"
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr "dla rolnictwa"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-msgid "yes"
-msgstr "tak"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "droga prywatna"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-msgstr "dla wyznaczonych pojazdów"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "dojazd do posesji"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr "dopuszczalny"
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr "dla rolnictwa"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "nie"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr "Zaopatrzenie"
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Samochody dostawcze"
@@ -18412,10 +18628,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr "Konie"
@@ -18431,10 +18647,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "Motocykle"
@@ -18449,27 +18665,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr "Samochody"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr "Transport publiczny"
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr "Motorówka"
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "Łódka"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Min. prędkość (km/h)"
@@ -18477,25 +18685,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "Max. ciężar (w tonach)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr "Maks. wysokość (w metrach)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr "Maks. szerokość (w metrach)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr "Maks. długość (w metrach)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "rondo"
@@ -18506,5 +18714,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "Edycja skrzyżowania"
@@ -18524,10 +18732,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "autostrada"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr "ciąg pieszy"
@@ -18549,10 +18757,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "droga ekspresowa"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr "droga ekspresowa - dojazd"
@@ -18574,10 +18782,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "droga krajowa"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr "droga krajowa - dojazd"
@@ -18599,5 +18807,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -18612,9 +18820,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "droga powiatowa"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr "droga gminna"
@@ -18628,9 +18836,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "droga lokalna"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr "strefa zamieszkania"
@@ -18660,10 +18868,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "droga serwisowa"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr "wydzielony pas autobusowy"
@@ -18693,5 +18901,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -18703,10 +18911,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Edycja mostu"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr "Edycja tunelu"
@@ -18714,19 +18922,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Drogi"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "w budowie"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "Edycja drogi w budowie"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "Skrzyżowanie"
@@ -18742,5 +18950,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "rondo"
@@ -18748,5 +18956,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr "droga gruntowa"
@@ -18755,40 +18963,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr "Edycja drogi gruntowej"
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "droga gruntowa"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "żwir"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "żwir"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "żwir"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "żwir"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "żwir"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr ""
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -18796,5 +18998,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -18802,37 +19004,32 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "szlak górski"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
-msgstr "stromy szlak górski"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
-msgstr "szlak alpejski"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
-msgstr "stromy szlak alpejski"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
-msgstr "trudny szlak alpejski"
+msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "ścieżka"
@@ -18841,12 +19038,32 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "Edycja ścieżki"
 
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
+
 #: build/trans_presets.java:489
-#, fuzzy
 msgid "Wheelchairs"
-msgstr "dla niepełnosprawnych"
+msgstr ""
 
 #: build/trans_presets.java:490
@@ -18862,7 +19079,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "Edycja ścieżki do jazdy konnej"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -18875,7 +19091,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "Edycja ścieżki rowerowej"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -18910,24 +19125,21 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "Połącz mimo tego"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "Edycja drogi dla pieszych"
+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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Edycja drogi dla pieszych"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr ""
@@ -18935,5 +19147,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "schody"
@@ -18943,5 +19155,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Edycja schodów"
@@ -18949,10 +19161,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr "Punkty drogowe"
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "skrzyżowanie autostrad"
@@ -18960,15 +19172,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "Edycja skrzyżowania autostrad"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "Numer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "miejsce obsługi podróżnych"
@@ -18976,5 +19188,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr "Edycja miejsca obsługi podróżnych"
@@ -18982,5 +19194,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -19013,17 +19226,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "Operator"
@@ -19032,5 +19245,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "sygnalizacja świetlna"
@@ -19040,5 +19253,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr "Typ przejścia dla pieszych"
@@ -19047,27 +19260,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr "sygnalizacja świetlna"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "wysepka"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr "nieoznakowane"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr ""
@@ -19075,6 +19288,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr ""
@@ -19083,11 +19296,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -19095,30 +19308,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "znak stop"
@@ -19126,5 +19339,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -19133,14 +19346,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr "Miniaturowe rondo"
@@ -19151,14 +19410,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr "Kierunek"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr "zgodnie z ruchem wskazówek zegara"
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr "miejsce do zawracania"
@@ -19168,26 +19427,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "granica miasta"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "Edycja tablicy oznaczającej granicę miasta"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr "Druga nazwa"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 msgid "Speed Camera"
 msgstr "fotoradar"
 
 #. 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "Telefon alarmowy"
@@ -19195,5 +19456,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr ""
@@ -19201,5 +19462,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr ""
@@ -19207,11 +19468,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr "bród"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr "Edycja brodu"
@@ -19219,5 +19487,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr "przełęcz"
@@ -19225,5 +19493,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr "Edycja przełęczy"
@@ -19235,7 +19503,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "Wysokość"
@@ -19243,5 +19511,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Przeszkody"
@@ -19249,5 +19517,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr "słupek drogowy"
@@ -19255,5 +19523,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr "Edycja słupka drogowego"
@@ -19298,16 +19566,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr ""
@@ -19316,5 +19584,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr ""
@@ -19322,5 +19590,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr "przeszkoda dla bydła"
@@ -19328,10 +19596,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr "Edycja przeszkody dla bydła"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr ""
@@ -19339,15 +19607,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr "Kolczatka"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr "Edycja kolczatki"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "punkt poboru opłat"
@@ -19355,5 +19623,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "Edycja punktu poboru opłat"
@@ -19361,10 +19629,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr "przejście graniczne"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr "Edycja przejścia granicznego"
@@ -19374,5 +19642,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr "żywopłot"
@@ -19381,12 +19649,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:817 build/trans_presets.java:819
 msgid "Fence"
 msgstr "ogrodzenie"
 
-#. item "Barriers/Fence"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "mur"
@@ -19394,5 +19674,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "mury miejskie"
@@ -19401,5 +19681,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr "mur oporowy"
@@ -19411,15 +19691,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr "Wejście"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr "Edycja wejścia"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "brama"
@@ -19427,50 +19708,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr "Edycja bramy"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr "przełaz"
@@ -19478,25 +19759,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr "Edycja przełazu"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr ""
@@ -19507,11 +19788,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "zbiornik wodny"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "źródło"
@@ -19519,5 +19800,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "plaża"
@@ -19525,5 +19806,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr "odpływ"
@@ -19531,10 +19812,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr "Edycja odpływu"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "strumień"
@@ -19542,10 +19834,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "Edycja strumienia"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "kanał"
@@ -19553,10 +19845,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "Edycja kanału"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "rzeka"
@@ -19566,5 +19858,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "Edycja rzeki"
@@ -19572,15 +19864,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Edycja zbiornika wodnego"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "ląd"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "Edycja lądu"
@@ -19588,15 +19880,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr "zbiornik wodny"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr "Edycja zbiornika wodnego"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr "sztuczne jezioro"
@@ -19604,15 +19896,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr "Edycja sztucznego jeziora"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -19620,5 +19912,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr ""
@@ -19627,10 +19919,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr "mokradło"
@@ -19641,14 +19933,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr "Edycja mokradła"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "bagno"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr "torfowisko"
@@ -19662,35 +19954,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr "marsze"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr "szuwary"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr "tereny zalewowe"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr "namorzyny"
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "błota"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr "Edycja błot"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "plaża"
@@ -19698,20 +19990,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "Edycja plaży"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "zatoka"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "Edycja zatoki"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "klif"
@@ -19719,10 +20011,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "Edycja klifu"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "wybrzeże"
@@ -19730,5 +20022,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "Edycja zbiornika gazu"
@@ -19736,5 +20028,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "trasa promu"
@@ -19742,5 +20034,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr "Edycja trasy promu"
@@ -19749,5 +20041,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr "stocznia"
@@ -19755,10 +20047,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr "Edycja stoczni"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "dok"
@@ -19766,5 +20058,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr "Edycja doku"
@@ -19772,5 +20064,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "Tama"
@@ -19778,15 +20070,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "Edycja tamy"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr "Punkty drogi wodnej"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr "wrota śluzy"
@@ -19795,5 +20087,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr "jaz"
@@ -19801,20 +20093,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr "Edycja jazu"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "wodospad"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "Edycja wodospadu"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr ""
@@ -19823,15 +20115,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr "marina"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr "Edycja mariny"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "molo"
@@ -19839,10 +20131,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "Edycja molo"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr "terminal promowy"
@@ -19850,10 +20142,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr "Edycja terminalu promowego"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr "pochylnia"
@@ -19863,20 +20155,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr "Edycja pochylni"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "Kolej"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "tor"
@@ -19884,5 +20176,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr "Edycja toru"
@@ -19891,139 +20183,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr "standardowy"
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr "dworzec przetokowy"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr "bocznica"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr "odnoga"
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr "kolej"
+
+#. 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:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+msgid "Voltage"
+msgstr "Napięcie"
+
+#. 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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr "kolej wąskotorowa"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr "Edycja toru kolei wąskotorowej"
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr "tor jednoszynowy"
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr "Edycja toru jednoszynowego"
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr "kolej retro"
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr "Edycja kolei retro"
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr "trasa szybkiego tramwaju"
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr "Edycja trasy szybkiego tramwaju"
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "metro"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "Edycja toru metra"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "tramwaj"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr "Edycja torów tramwajowych"
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "nieużywany tor"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "Edycja opuszczonych torów"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr "Rodzaj (opcjonalne)"
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr "dworzec przetokowy"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr "bocznica"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr "odnoga"
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr "kolej wąskotorowa"
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr "Edycja toru kolei wąskotorowej"
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr "tor jednoszynowy"
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr "Edycja toru jednoszynowego"
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr "kolej retro"
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr "Edycja kolei retro"
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr "trasa szybkiego tramwaju"
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr "Edycja trasy szybkiego tramwaju"
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "metro"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "Edycja toru metra"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "tramwaj"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr "Edycja torów tramwajowych"
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "nieużywany tor"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "Edycja opuszczonych torów"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "nieczynny tor"
@@ -20032,5 +20563,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr "przejazd kolejowy"
@@ -20039,5 +20570,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr "przejazd przez tory"
@@ -20047,5 +20578,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr "Rodzaj przejazdu"
@@ -20053,5 +20584,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "obrotnica"
@@ -20060,10 +20591,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr "Koleje linowe"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "wyciąg krzesełkowy"
@@ -20071,10 +20609,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr "Edycja wyciągu krzesełkowego"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr "wyciąg orczykowy"
@@ -20082,10 +20620,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr "Edycja wyciągu orczykowego"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "kolej linowa"
@@ -20093,10 +20631,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "Edycja kolei linowej"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr ""
@@ -20104,10 +20642,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20115,12 +20653,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr ""
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "stacja benzynowa"
@@ -20130,9 +20681,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Edycja stacji benzynowej"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20186,32 +20794,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "godziny otwarcia"
@@ -20270,94 +20878,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20369,5 +21053,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20377,5 +21061,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Edycja parkingu"
@@ -20386,25 +21070,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr "Numer referencyjny"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "wielopoziomowy"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "powierzchnia"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr "podziemny"
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr ""
@@ -20413,48 +21097,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "Opłata"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr "Miejsca dla niepełnosprawnych"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "Myjnia samochodowa"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "Edycja myjni samochodowej"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr ""
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr ""
@@ -20462,5 +21146,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "wypożyczalnia"
@@ -20469,10 +21153,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "Edycja wypożyczalni samochodów"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr ""
@@ -20480,5 +21164,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr ""
@@ -20486,10 +21170,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "Edycja parkingu dla rowerów"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr "Pojemność"
@@ -20498,15 +21182,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "Edycja wypożyczalni rowerów"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Transport publiczny"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -20516,5 +21200,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -20522,5 +21206,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr ""
@@ -20528,5 +21212,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr "przystanek kolejowy"
@@ -20534,5 +21218,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr "Edycja przystanku kolejowego"
@@ -20540,5 +21224,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "przystanek tramwajowy"
@@ -20547,5 +21231,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "Edycja przystanku tramwajowego"
@@ -20553,5 +21237,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "Platforma kolejowa"
@@ -20560,5 +21244,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "Edytuj platformę kolejową"
@@ -20570,5 +21254,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr "Oznaczenie (numer toru)"
@@ -20576,10 +21260,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr "obszar"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "wejście do metra"
@@ -20588,10 +21272,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "Edycja wejścia do metra"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr "dla niepełnosprawnych"
@@ -20600,5 +21284,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "dworzec autobusowy"
@@ -20607,5 +21291,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "Edycja dworca autobusowego"
@@ -20613,5 +21297,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "Przystanek autobusowy"
@@ -20621,5 +21305,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "Edycja przystanku autobusowego"
@@ -20628,31 +21312,32 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr "schronienie"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "ławka"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
-msgstr ""
+msgstr "peron autobusowy"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
-msgstr ""
+msgstr "Edycja peronu autobusowego"
 
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "taksówki"
@@ -20660,5 +21345,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "Edycja postoju taksówek"
@@ -20666,32 +21351,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "lotnisko"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr "Edycja lotniska"
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr "IATA"
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr "ICAO"
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+msgid "Beacon"
+msgstr "radiolatarnia"
+
+#. 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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Zakwaterowanie"
@@ -20703,5 +21483,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "hotel"
@@ -20710,15 +21490,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "Edycja hotelu"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "Gwiazdki"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr "motel"
@@ -20726,20 +21506,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr "Edycja motelu"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr "kwatera"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr "Edycja kwatery turystycznej"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "chata górska"
@@ -20747,10 +21527,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr "Edycja chaty górskiej"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr "hostel"
@@ -20758,30 +21538,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr "Edycja hostelu"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr "chata alpejska"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr "Edycja chaty alpejskiej"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr "kemping"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr "Edycja kempingu"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "pole namiotowe"
@@ -20789,10 +21569,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr "Edycja pola namiotowego"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Wyżywienie"
@@ -20803,5 +21583,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "restauracja"
@@ -20809,5 +21589,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "Edycja restauracji"
@@ -20815,5 +21595,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr "Kuchnia"
@@ -20821,61 +21601,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "włoska"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "chińska"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "hamburgery"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "grecka"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "niemiecka"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "indyjska"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "regionalna"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "turecka"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "azjatycka"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "tajska"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "meksykańska"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "japońska"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "fast food"
@@ -20883,9 +21675,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "Edycja restauracji fast-food"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "kawiarnia"
@@ -20893,9 +21693,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "Edycja kawiarni"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "pub"
@@ -20903,18 +21703,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "Edycja pubu"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr "ogródek piwny"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr "Edycja ogródka piwnego"
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr "bar"
@@ -20922,9 +21722,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr "Edycja baru"
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "klub nocny"
@@ -20932,24 +21732,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "Edycja klubu nocnego"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Turystyka"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr "atrakcja"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr "Edycja atrakcji turystycznej"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "muzeum"
@@ -20957,9 +21757,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Edycja muzeum"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "zoo"
@@ -20968,9 +21768,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Edycja zoo"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "punkt widokowy"
@@ -20978,24 +21778,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "Edycja punktu widokowego"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr "wieża widokowa"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "park rozrywki"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr "Edycja parku rozrywki"
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "sztuka"
@@ -21003,5 +21803,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "Edycja obiektu sztuki"
@@ -21009,19 +21809,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr ""
@@ -21059,5 +21859,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -21065,28 +21865,28 @@
 msgstr "ulica"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr ""
@@ -21096,5 +21896,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr ""
@@ -21102,5 +21902,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr "szlak"
@@ -21108,6 +21908,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "kolarstwo"
@@ -21115,5 +21915,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr ""
@@ -21121,6 +21921,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "narciarstwo"
@@ -21128,5 +21928,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr ""
@@ -21134,46 +21934,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "tablica historyczna"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr "tablica przyrodnicza"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr "tablica o zwierzętach"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr ""
@@ -21181,29 +21981,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr "Edycja schronienia"
@@ -21211,25 +22011,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr "miejsce na ognisko"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "miejsce na piknik"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "Edycja miejsca na piknik"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Miejsca historyczne"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "zamek"
@@ -21238,19 +22038,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Edycja zamku"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "ruiny"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Edycja ruin"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Wykopaliska archeologiczne"
@@ -21259,9 +22059,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "Edycja wykopalisk archeologicznych"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "pole bitwy"
@@ -21269,10 +22069,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "Edycja pola bitwy"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr ""
@@ -21280,5 +22080,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -21286,15 +22086,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "pomnik"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "Edycja pomnika"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "miejsce pamięci"
@@ -21302,55 +22102,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "Edycja miejsca pamięci"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr "krzyż przydrożny"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr "Edycja krzyża przydrożnego"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr "kapliczka"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr "Edycja kapliczki"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Rozrywka"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "park wodny"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "Edycja parku wodnego"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "plac zabaw"
@@ -21358,35 +22158,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Edycja placu zabaw"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "miejsce do wędkowania"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "Edycja miejsca do wędkowania"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr "obiekty sportowe"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Edycja stadionu"
@@ -21400,6 +22200,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "wybierz sport:"
@@ -21791,6 +22591,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -21824,225 +22624,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr "różne sporty"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "łucznictwo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr "lekkoatletyka"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "siatkówka"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr "bule"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr "gra w kule"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr "kajakarstwo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "wspinaczka"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr "krykiet"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr "krokiet"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "kolarstwo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr "wyścigi psów"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr "jazda konna"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "gimnastyka"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr "wyścigi konne"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr "sporty motorowe"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "strzelectwo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr "jazda na deskorolce"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr "łyżwiarstwo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "narciarstwo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "piłka nożna"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "pływanie"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "tenis stołowy"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "centrum sportowe"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "Edycja centrum sportowego"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr "boisko"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr "Edycja boiska"
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr "tor wyścigowy"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr "Edycja toru wyścigowego"
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "pole golfowe"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "Edycja pola golfowego"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "miniaturowy golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "Edycja miniaturowego golfa"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr "różne sporty"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr ""
@@ -22081,21 +22881,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "rodzaj"
@@ -22134,203 +22934,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr "boisko"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "centrum sportowe"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr "kręgle"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr "Edycja kręgli"
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr "lekkoatletyka"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr "Edycja"
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "łucznictwo"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "wspinaczka"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr "kajakarstwo"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "wyścigi psów"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr "jeździectwo"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr "wyścigi konne"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "gimnastyka"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "sporty motorowe"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr "łyżwiarstwo"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr "jazda na deskorolce"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "pływanie"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr ""
@@ -22338,56 +23138,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr "Rodzaj trasy"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr "Poziom trudności"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr "dla początkujących"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr "łatwa"
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr ""
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr "dla ekspertów"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "strzelectwo"
@@ -22395,182 +23191,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "Sporty z piłką"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "piłka nożna"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "football"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr "australijski football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "koszykówka"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "pole golfowe"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr "bule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr "Edycja boiska do gry w boule"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr "gra w kule"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr "krykiet"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr "Edycja boiska do gry w krykieta"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr "krykiet - siatki"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr "Edycja siatek do treningu gry w krykieta"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr "krokiet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr "Edycja miejsca do gry w krokieta"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "Edycja miejsca do gry w hokeja"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr "Edycja miejsca do gry w pelotę"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr "Edycja miejsca do gry w rugby"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "tenis stołowy"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "Edycja miejsca do gry w tenis stołowy"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "Edycja miejsca do gry w tenisa"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Budynki"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "budynek"
@@ -22578,5 +23374,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "budynek użyteczności publicznej"
@@ -22584,10 +23380,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Edycja budynku użyteczności publicznej"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "ratusz"
@@ -22595,10 +23391,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Edycja ratusza"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "ambasada"
@@ -22606,10 +23402,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Edycja ambasady"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "sąd"
@@ -22618,10 +23414,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Edycja siedziby sądu"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "więzienie"
@@ -22630,10 +23426,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Edycja więzienia"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "posterunek policji"
@@ -22643,10 +23439,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Edycja posterunku policji"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "straż pożarna"
@@ -22655,10 +23451,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Edycja posterunku straży pożarnej"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "poczta"
@@ -22666,5 +23462,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Edycja urzędu pocztowego"
@@ -22672,15 +23468,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "przedszkole"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "Edycja przedszkola"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "szkoła"
@@ -22688,10 +23484,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "Edycja szkoły"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "uniwersytet"
@@ -22699,10 +23495,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "Edycja uniwersytetu"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "college"
@@ -22710,5 +23506,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "Edycja college'u"
@@ -22716,5 +23512,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "kino"
@@ -22723,10 +23519,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Edycja kina"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "biblioteka"
@@ -22735,9 +23531,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Edycja biblioteki"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "centrum kulturalne"
@@ -22745,10 +23541,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "Edycja centrum kulturalnego"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "teatr"
@@ -22757,10 +23553,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Edycja teatru"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "miejsce kultu religijnego"
@@ -22770,5 +23566,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "Edycja miejsca kultu religijnego"
@@ -22777,6 +23573,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "Religia"
@@ -22785,66 +23581,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr "bahaizm"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "buddyzm"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "chrześcijaństwo"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "hinduizm"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr "dżinizm"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "judaizm"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "islam"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr "sikhizm"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr "spirytualizm"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr "taoizm"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr "zaratusztrianizm"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr "Wyznanie"
@@ -22853,81 +23649,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr "kościół anglikański"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "baptyści"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "kościół katolicki"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr "ewangelikalizm"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr "świadkowie Jehowy"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "luteranie"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr "metodyści"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr "mormoni"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "kościół prawosławny"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr "zielonoświątkowcy"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr "prezbiterianie"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "protestanci"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr "kwakrzy"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr "szyici"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr "sunnici"
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Adresy"
@@ -22936,5 +23732,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Edycja informacji o adresach"
@@ -22942,5 +23738,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "Numer domu"
@@ -22948,25 +23744,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "Nazwa domu"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Nazwa ulicy"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "Nazwa miejscowości"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Kod pocztowy"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "Kod kraju"
@@ -22975,5 +23771,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "Edycja interpolacji adresów"
@@ -22981,61 +23777,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr "Sposób numeracji domów"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "nieparzyste"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "parzyste"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr "Obiekty sztuczne"
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "zakład produkcyjny"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "Edycja zakładu produkcyjnego"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "wieża"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Edycja wieży"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr ""
@@ -23043,25 +23839,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "wieża ciśnień"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Edycja wieży ciśnień"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "zbiornik gazu"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "Edycja zbiornika gazu"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "latarnia morska"
@@ -23069,10 +23865,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Edycja latarni morskiej"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "wiatrak"
@@ -23080,10 +23876,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Edycja wiatraka"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "rurociąg"
@@ -23092,37 +23888,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Edycja rurociągu"
 
-#: build/trans_presets.java:2198
-msgid "oil"
-msgstr ""
-
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
 msgid "gas"
 msgstr "gazowa"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr ""
+
+#: build/trans_presets.java:2353
+msgid "oil"
+msgstr ""
+
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "oczyszczalnia ścieków"
@@ -23132,10 +23928,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "Edycja oczyszczalni ścieków"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "dźwig"
@@ -23143,21 +23939,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Edycja dźwigu"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr "radiolatarnia"
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr "Edycja radiolatarni"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "punkt geodezyjny"
@@ -23165,10 +23956,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "Edycja punktu geodezyjnego"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "monitoring"
@@ -23176,11 +23967,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Edycja kamery do monitoringu"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "źródło energii elektrycznej"
@@ -23190,35 +23993,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "Edycja źródła energii elektrycznej"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "wiatrowa"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "wodna"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "cieplna"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "jądrowa"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "węglowa"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr "fotowoltaiczna"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "elektrownia"
@@ -23227,10 +24030,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "Edycja elektrowni"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "rozdzielnia elektryczna"
@@ -23239,5 +24042,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "Edycja rozdzielni elektrycznej"
@@ -23245,10 +24048,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr "oznaczenie linii"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "słup elektryczny"
@@ -23259,23 +24062,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "Edycja słupa linii wysokiego napięcia"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "linia wysokiego napięcia"
@@ -23284,79 +24087,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "Edycja linii wysokiego napięcia"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr ""
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "Napięcie"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "toalety"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr "Uwagi"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "skrzynka pocztowa"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "telefon"
@@ -23365,5 +24163,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Edycja telefonu"
@@ -23371,5 +24169,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "na monety"
@@ -23377,5 +24175,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "na banknoty"
@@ -23383,5 +24181,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr "na karty chipowe"
@@ -23389,5 +24187,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr "na karty debetowe"
@@ -23395,15 +24193,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "na karty kredytowe"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "na karty telefoniczne"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "zbiórka odpadów"
@@ -23412,5 +24210,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Edycja punktu zbiórki odpadów"
@@ -23418,63 +24216,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "baterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "puszki"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "odzież"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "szkło"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "złom"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+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:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr ""
@@ -23553,5 +24362,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -23561,31 +24370,31 @@
 msgstr "zielony"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr "Ambona myśliwska"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr "Edycja ambony strzelniczej"
@@ -23594,30 +24403,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "Wysokość"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr "Ukryj"
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr "Zablokuj"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "fontanna"
@@ -23626,10 +24435,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "Edycja fontanny"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "woda do picia"
@@ -23638,10 +24447,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Edycja punktu z wodą pitną"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr ""
@@ -23649,15 +24471,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Sklepy"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr ""
@@ -23665,10 +24487,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "Edycja warsztatu samochodowego"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr ""
@@ -23677,28 +24499,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "Edycja warsztatu rowerowego"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "Edycja supermarketu"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr "sklepik"
@@ -23706,9 +24528,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr "Edycja sklepiku"
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "kiosk"
@@ -23716,27 +24538,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "Edycja kiosku"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "automat sprzedający"
@@ -23744,5 +24566,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "Edycja automatu sprzedającego"
@@ -23750,88 +24572,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "Sprzedawane produkty"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr "bilety komunikacji miejskiej"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr "mapy komunikacji miejskiej"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr "bilety parkingowe"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "jedzenie"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "napoje"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "słodycze"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "papierosy"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "zdjęcia"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "jedzenie dla zwierząt"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "gazety"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "zabawki"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "znaczki"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "karty SIM"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr "vouchery"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "prezerwatywy"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr "tampony"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr "torby na odchody"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "rzeźnik"
@@ -23839,9 +24661,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Edycja sklepu mięsnego"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "piekarnia"
@@ -23849,9 +24671,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Edycja piekarni"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "florysta"
@@ -23859,18 +24681,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "Edycja kwiaciarni"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr "naturalna żywność"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr "Edycja sklepu z naturalną żywnością"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr "monopolowy"
@@ -23878,54 +24700,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr "napoje"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr "Komputer"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "Edycja sklepu komputerowego"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr "elektronika"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "Edycja sklepu z elektroniką"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr "sprzęt hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr "Edycja sklepu ze sprzętem hi-fi"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr "meble"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "Edycja sklepu meblowego"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr "centrum ogrodnicze"
@@ -23933,9 +24755,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr "Edycja centrum ogrodniczego"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr ""
@@ -23943,9 +24765,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "sklep DIY"
@@ -23953,54 +24775,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "Edycja sklepu DIY (zrób to sam)"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr "artykuły biurowe"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr "Edycja sklepu z artykułami biurowymi"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "fryzjer"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "Edycja salonu fryzjerskiego"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr "obuwie"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "Edycja sklepu obuwniczego"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr "zabawki"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "Edycja sklepu z zabawkami"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "pralnia chemiczna"
@@ -24008,9 +24830,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Edycja palni chemicznej"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "pralnia samoobsługowa"
@@ -24018,9 +24840,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "wyspa"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr "sklep turystyczny"
@@ -24028,28 +24850,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr "Edycja sklepu ze sprzętem turystycznym"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr "Edycja sklepu sportowego"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "Edycja optyka"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Gotówka"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "bank"
@@ -24057,14 +24879,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Edycja banku"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "kantor"
@@ -24072,5 +24894,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Edycja kantoru"
@@ -24078,15 +24900,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Edycja bankomatu"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Zdrowie"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "lekarz"
@@ -24094,18 +24916,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "Edycja lekarza"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "dentysta"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "Edycja dentysty"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "apteka"
@@ -24113,5 +24935,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Edycja apteki"
@@ -24119,9 +24941,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr "realizacja recept"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "szpital"
@@ -24129,10 +24951,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Edycja szpitala"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr ""
@@ -24141,5 +24963,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -24148,20 +24970,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr "Numer punktu"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "Numer telefonu"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Podaj razem z kodem kraju, np.: +12-345-67890)"
@@ -24169,5 +24991,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "weterynarz"
@@ -24176,64 +24998,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "Edycja lecznicy weterynaryjnej"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Miejsca"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "kontynent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Edycja kontynentu"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "kraj"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Edycja kraju"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "stan"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "Edycja stanu"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "Edycja regionu"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr "okręg"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr "Edycja okręgu / hrabstwa"
@@ -24241,15 +25063,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "miasto"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "Edycja miasta"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "miejscowość"
@@ -24257,10 +25079,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "Edycja miejscowości"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "dzielnica"
@@ -24268,25 +25090,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "Edycja dzielnicy"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "wieś"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Edycja wsi"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "przysiółek"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "Edycja wólki"
@@ -24294,5 +25116,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr "okolica"
@@ -24300,10 +25122,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr "Edycja okolicy"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "wyspa"
@@ -24311,10 +25133,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Edycja wyspy"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr ""
@@ -24322,5 +25144,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr ""
@@ -24328,5 +25150,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "wejście do jaskini"
@@ -24334,10 +25156,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "Edycja wejścia do jaskini"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "wzgórze"
@@ -24345,10 +25167,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Edycja wzgórza"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "lodowiec"
@@ -24356,10 +25178,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "Edycja lodowca"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "wulkan"
@@ -24367,70 +25189,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "Edycja wulkanu"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Granice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "narodowa"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "Edycja granicy narodowej"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "administracyjna"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "Edycja granicy administracyjnej"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "Edycja granicy politycznej"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr "park narodowy"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "Edycja granicy parku narodowego"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Zagospodarowanie terenu"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "drzewo"
@@ -24439,15 +25261,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Edycja drzewa"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "Nazwa systematyczna"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "las"
@@ -24456,5 +25278,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "Edycja lasu"
@@ -24462,17 +25284,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "iglasty"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "liściasty"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "mieszany"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "las"
@@ -24481,14 +25303,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "Edycja lasu"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "rezerwat przyrody"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "Edycja rezerwatu przyrody"
@@ -24496,25 +25318,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr "rumowisko"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr "Edycja rumowiska"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr "busz"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr "Edycja buszu"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr "turnia"
@@ -24522,10 +25344,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr "Edycja turni"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr "wrzosowisko"
@@ -24533,5 +25355,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "Edycja wrzosowiska"
@@ -24539,5 +25361,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr "zagroda"
@@ -24546,45 +25368,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr "Edycja zagrody"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "grunty rolne"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr "Edycja gruntów rolnych"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr "łąka"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr "Edycja łąki"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "winnica"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "Edycja winnicy"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr "ogródki działkowe"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr "Edycja ogródków działkowych"
@@ -24592,25 +25414,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "ogród"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "Edycja ogrodu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "Trawa"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr ""
@@ -24618,10 +25440,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr "miejsce publiczne"
@@ -24629,20 +25451,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr "Edycja miejsca publicznego"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "Edycja parku"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr "Teren rekreacyjny"
@@ -24650,5 +25472,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr "Edycja terenu rekreacyjnego"
@@ -24656,15 +25478,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "zabudowa mieszkaniowa"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr "Edycja zabudowy mieszkaniowej"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "cmentarz"
@@ -24672,9 +25494,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Edycja cmentarza"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "cmentarz"
@@ -24682,39 +25504,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "Edycja cmentarza"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "handel"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr "Edycja obszaru handlowego"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "biura i usługi"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr "Edycja obszaru biur i usług"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "teren przemysłowy"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr "Edycja terenu przemysłowego"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr "teren kolejowy"
@@ -24722,15 +25544,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr "Edycja terenu kolejowego"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "obszar wojskowy"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr "Edycja obszaru wojskowego"
@@ -24738,50 +25560,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "budowa"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "Edycja terenu budowy"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr "teren pod zabudowę"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr "Edycja terenu pod zabudowę"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr "wysypisko"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr "Edycja wysypiska śmieci"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "kamieniołom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "Edycja komieniołomu"
@@ -24791,5 +25613,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr ""
@@ -24798,10 +25620,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr "zewnętrzny segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr "wewnętrzny segment"
@@ -24809,5 +25631,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr "ograniczenia skrętu"
@@ -24816,5 +25638,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr "Edycja ograniczenia skrętu"
@@ -24822,34 +25644,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr "Ograniczenie"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr "brak skrętu w lewo"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr "brak skrętu w prawo"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr "zakaz jazdy prosto"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr "zakaz zawracania"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr "nakaz skrętu w prawo"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr "nakaz skrętu w lewo"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr "nakaz jazdy prosto"
@@ -24858,15 +25680,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr "z drogi"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr "przez węzeł lub drogę"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr "do drogi"
@@ -24874,5 +25696,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr "Trasa"
@@ -24881,5 +25703,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr "Edytuj trasę"
@@ -24887,5 +25709,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr "Typ trasy"
@@ -24976,5 +25798,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -24984,17 +25806,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr "droga"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr "prom"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr ""
@@ -25054,5 +25876,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -25061,9 +25883,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr "tramway"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr "objazd"
@@ -25077,10 +25899,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr "Opis symboli"
@@ -25088,31 +25910,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr "Sieć"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr "proponowany"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr "alternatywny"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr "tymczasowy"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr "połaczenie"
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr "Kolor (hex)"
@@ -25121,107 +25943,32 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 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 "standardowy"
 
 #. mappaint style named "standard"
@@ -25757,77 +26504,4 @@
 msgid "highway_track"
 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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
-msgstr "kolej"
 
 #. color rail
@@ -26215,7 +26889,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "baptyści"
+msgstr ""
 
 #. color manmade
@@ -29354,69 +30027,60 @@
 msgstr ""
 
-#~ msgid "Bridleway"
-#~ msgstr "ścieżka do jazdy konnej"
-
-#~ msgid "Cycleway"
-#~ msgstr "ścieżka rowerowa"
-
-#~ msgid "Footway"
-#~ msgstr "droga dla pieszych"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "droga gruntowa klasy 1"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Edycja drogi gruntowej klasy 1"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "droga gruntowa klasy 2"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Edycja drogi gruntowej klasy 2"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "droga gruntowa klasy 3"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Edycja drogi gruntowej klasy 3"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "droga gruntowa klasy 4"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Edycja drogi gruntowej klasy 4"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "droga gruntowa klasy 5"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Edycja drogi gruntowej klasy 5"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Edycja szlaku"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Edycja szlaku górskiego"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "miejsce do zawracania"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Edycja szlaku alpejskiego"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Edycja stromego szlaku alpejskiego"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Edycja trudnego szlaku alpejskiego"
-
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "Parametr \"{0}\" nie może być pusty (ang. null)"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parameter ''{0}'' nie może być pusty (null)"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "Oczekiwałem warstwy danych OSM, bądź GPX. Otrzymałem \"{0}\"."
+#~ msgid "Move"
+#~ msgstr "Przenieś"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Nieznane rozszerzenie pliku."
+
+#~ msgid "Email"
+#~ msgstr "E-mail"
+
+#~ msgid "Load Selection"
+#~ msgstr "Załaduj zaznaczenie"
+
+#~ msgid "Contact {0}..."
+#~ msgstr "Kontakt {0}..."
+
+#~ msgid "Downloading..."
+#~ msgstr "Pobieranie..."
+
+#~ msgid "Delete the selected layer."
+#~ msgstr "Usuń zaznaczoną warstwę."
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Niezapisane zmiany"
+
+#~ msgid "Object"
+#~ msgstr "Obiekt"
+
+#~ msgid "Unknown version"
+#~ msgstr "Nieznana wersja"
+
+#~ msgid "Incorrect password or username."
+#~ msgstr "Nieprawidłowe hasło lub nazwa użytkownika."
+
+#~ msgid "true"
+#~ msgstr "prawda"
+
+#~ msgid "false"
+#~ msgstr "fałsz"
+
+#~ msgid "unnamed"
+#~ msgstr "bez nazwy"
+
+#~ msgid "Sync clock"
+#~ msgstr "Synchronizuj zegar"
+
+#~ msgid "Data Layer"
+#~ msgstr "Warstwa danych"
+
+#~ msgid "Do not show again"
+#~ msgstr "Nie pokazuj ponownie"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Błąd podczas przetwarzania"
 
 #~ msgid "image"
@@ -29426,61 +30090,4 @@
 #~ msgstr[2] "obrazów"
 
-#~ msgid "Move"
-#~ msgstr "Przenieś"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Żaden dokument nie jest otwarty więc nie ma nic do zapisania."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Nieznane rozszerzenie pliku."
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "Load Selection"
-#~ msgstr "Załaduj zaznaczenie"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Kontakt {0}..."
-
-#~ msgid "Downloading..."
-#~ msgstr "Pobieranie..."
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Usuń zaznaczoną warstwę."
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Niezapisane zmiany"
-
-#~ msgid "Object"
-#~ msgstr "Obiekt"
-
-#~ msgid "Unknown version"
-#~ msgstr "Nieznana wersja"
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Nieprawidłowe hasło lub nazwa użytkownika."
-
-#~ msgid "true"
-#~ msgstr "prawda"
-
-#~ msgid "false"
-#~ msgstr "fałsz"
-
-#~ msgid "unnamed"
-#~ msgstr "bez nazwy"
-
-#~ msgid "Sync clock"
-#~ msgstr "Synchronizuj zegar"
-
-#~ msgid "Data Layer"
-#~ msgstr "Warstwa danych"
-
-#~ msgid "Do not show again"
-#~ msgstr "Nie pokazuj ponownie"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Błąd podczas przetwarzania"
-
 #~ msgid "Image"
 #~ msgstr "Obraz"
@@ -29546,6 +30153,45 @@
 #~ msgstr "opcje osmarender"
 
-#~ msgid "Station"
-#~ msgstr "stacja"
+#~ msgid "Motorboat"
+#~ msgstr "Motorówka"
+
+#~ msgid "Boat"
+#~ msgstr "Łódka"
+
+#~ msgid "Bridleway"
+#~ msgstr "ścieżka do jazdy konnej"
+
+#~ msgid "Cycleway"
+#~ msgstr "ścieżka rowerowa"
+
+#~ msgid "Footway"
+#~ msgstr "droga dla pieszych"
+
+#~ msgid "Track Grade 1"
+#~ msgstr "droga gruntowa klasy 1"
+
+#~ msgid "Track Grade 2"
+#~ msgstr "droga gruntowa klasy 2"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "droga gruntowa klasy 3"
+
+#~ msgid "Track Grade 4"
+#~ msgstr "droga gruntowa klasy 4"
+
+#~ msgid "Track Grade 5"
+#~ msgstr "droga gruntowa klasy 5"
+
+#~ msgid "Edit Hiking"
+#~ msgstr "Edycja szlaku"
+
+#~ msgid "Edit Mountain Hiking"
+#~ msgstr "Edycja szlaku górskiego"
+
+#~ msgid "Edit Demanding Mountain Hiking"
+#~ msgstr "miejsce do zawracania"
+
+#~ msgid "Edit Alpine Hiking"
+#~ msgstr "Edycja szlaku alpejskiego"
 
 #~ msgid "Shop"
@@ -29810,8 +30456,4 @@
 #~ "czterech węzłach."
 
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr ""
-#~ "Wybierz drogi o kątach prawie prostych aby skorygować ich prostopadłość."
-
 #~ msgid "Please enter a search string"
 #~ msgstr "Wpisz proszę czego szukać"
@@ -29840,7 +30482,4 @@
 #~ msgid "GPS unit timezone (difference to photo)"
 #~ msgstr "Strefa czasowa urządzenia GPS (różnica do zdjęcia)"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Podany czas nie został rozpoznany."
 
 #~ msgid "The base URL for the OSM server (REST API)"
@@ -29893,7 +30532,4 @@
 #~ msgstr ""
 #~ "Otwiera okno OpenStreetBugs i aktywuje automatyczne pobieranie danych"
-
-#~ msgid "board"
-#~ msgstr "tablica informacyjna"
 
 #~ msgid "Cannot read place search results from server"
@@ -29988,4 +30624,25 @@
 #~ msgstr "Edycja właściwości"
 
+#~ msgid "Edit Track of grade 1"
+#~ msgstr "Edycja drogi gruntowej klasy 1"
+
+#~ msgid "Edit Track of grade 2"
+#~ msgstr "Edycja drogi gruntowej klasy 2"
+
+#~ msgid "Edit Track of grade 3"
+#~ msgstr "Edycja drogi gruntowej klasy 3"
+
+#~ msgid "Edit Track of grade 4"
+#~ msgstr "Edycja drogi gruntowej klasy 4"
+
+#~ msgid "Edit Track of grade 5"
+#~ msgstr "Edycja drogi gruntowej klasy 5"
+
+#~ msgid "Edit Demanding Alpine Hiking"
+#~ msgstr "Edycja stromego szlaku alpejskiego"
+
+#~ msgid "Edit Difficult Alpine Hiking"
+#~ msgstr "Edycja trudnego szlaku alpejskiego"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Edycja mostu zwodzonego"
@@ -30024,7 +30681,4 @@
 #~ msgid "Delete and Download"
 #~ msgstr "Usuń i pobierz"
-
-#~ msgid "Interpolation"
-#~ msgstr "Interpolacja"
 
 #~ msgid "Board Type"
@@ -30120,4 +30774,7 @@
 #~ "lub <A HREF=\"{1}\">po polsku</A>."
 
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "parameter ''{0}'' nie może być pusty (null)"
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "niespodziewana wartość powrotna. Dostałem {0}"
@@ -30126,4 +30783,7 @@
 #~ msgstr "Nie można odczytać \"{0}\""
 
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr "Oczekiwałem warstwy danych OSM, bądź GPX. Otrzymałem \"{0}\"."
+
 #~ msgid "Updates the currently selected primitives from the server"
 #~ msgstr "Odświerzam wybrane elementy pobierając z serwera."
@@ -30131,2 +30791,5 @@
 #~ msgid "Updating primitive"
 #~ msgstr "Odświeżam element"
+
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "Parametr \"{0}\" nie może być pusty (ang. null)"
Index: applications/editors/josm/i18n/po/pt_BR.po
===================================================================
--- applications/editors/josm/i18n/po/pt_BR.po	(revision 19689)
+++ applications/editors/josm/i18n/po/pt_BR.po	(revision 19698)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 23:20-0500\n"
-"PO-Revision-Date: 2010-01-18 13:03-0500\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-28 18:31+0000\n"
 "Last-Translator: vitor <vitor.george@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@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-01-13 18:25+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -34,5 +34,5 @@
 #, java-format
 msgid "Ignoring malformed file URL: \"{0}\""
-msgstr "Ignorando arquivo malformado: \"{0}\""
+msgstr "Ignorando URL de arquivo mal formada: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/Main.java:397
@@ -70,11 +70,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -95,10 +95,10 @@
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
-"Parâmetros \"downloadgps\" não aceita nome de arquivos ou URLs de arquivos."
+"Parâmetro \"downloadgps\" não aceita nomes de arquivos ou URLs de arquivos."
 
 #: ../core/src/org/openstreetmap/josm/Main.java:497
 #, java-format
 msgid "Ignoring malformed URL: \"{0}\""
-msgstr "Ignorando URL malformada: \"{0}\""
+msgstr "Ignorando URL mal formada: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/AboutAction.java:39
@@ -245,5 +245,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -257,13 +257,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -272,5 +272,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -296,5 +299,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Combinar"
@@ -325,5 +328,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -390,9 +393,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -400,5 +403,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "Aceitar"
@@ -449,6 +454,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -466,5 +471,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -473,11 +478,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -514,5 +519,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "conflito"
@@ -647,14 +652,14 @@
 msgstr "Por favor selecione no mínimo 2 caminhos a combinar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Copiar objetos selecionados para memória de colagem"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Por favor selecione algo a ser copiado"
@@ -687,8 +692,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -697,5 +702,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -753,16 +758,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Houve {0} conflitos durante a importação."
-msgstr[1] "Houve {0} conflitos durante a importação."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "Conflitos durante download"
-msgstr[1] "Conflitos durante download"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -783,4 +787,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -790,4 +796,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplicar seleção através de cópia e colagem imediata."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Vias duplicadas"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "Editar relação selecionada atualmente"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "Camada: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "Aproximar para {0}"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr ""
 
 #. <button label="Info" hotkey="I">
@@ -879,10 +913,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 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] "O caminho selecionado não contém o nó selecionado."
-msgstr[1] "O caminho selecionado não contém todos nós selecionados."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -1003,5 +1036,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "URL"
@@ -1153,5 +1186,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+#, fuzzy
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr "<html>Não foi possível abrir o diretório.<br>Selecione um arquivo!"
 
@@ -1165,9 +1199,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Abrindo {0} arquivos..."
-msgstr[1] "Abrindo {0} arquivos..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1223,7 +1257,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1237,5 +1271,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "Mover nós ao ponto de todos ângulos serem 90 ou 270 graus"
 
@@ -1277,4 +1312,8 @@
 "Mude sua projeção para se livrar do presente aviso. <br> Quer continuar?"
 
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+msgid "Selection must consist only of ways and nodes."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
 msgid "Orthogonalize"
@@ -1289,4 +1328,17 @@
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "Os Elementos selecionados não podem ser ortogonalizados"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr ""
+"Por favor selecione caminhos com ângulos praticamente retos para "
+"ortogonalização"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1303,9 +1355,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151
 msgid "Delete incomplete members?"
-msgstr ""
+msgstr "Apagar membros incompletos?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152
 msgid "Paste without incomplete members"
-msgstr ""
+msgstr "Colar sem membros incompletos"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
@@ -1315,4 +1367,6 @@
 "incomplete primitives?"
 msgstr ""
+"Os dados copiados contem primitivas incompletas. Ao colar se apagarão as "
+"primitivas incompletas. Deseja colar os dados sem as primitivas incompletas?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
@@ -1394,18 +1448,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1430,12 +1484,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Erro"
@@ -1570,5 +1625,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1775,9 +1830,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "Duplicar {0} nós em {1} nós"
-msgstr[1] "Duplicar {0} nós em {1} nós"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1821,5 +1876,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr "Dados baixados"
@@ -1828,5 +1883,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:27
 msgid "Update modified"
-msgstr ""
+msgstr "Atualização modificada"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:25
@@ -2257,6 +2312,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2339,7 +2394,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
-#, fuzzy
 msgid "<not>"
-msgstr "norte"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
@@ -2352,7 +2406,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
-#, fuzzy
 msgid "<right parent>"
-msgstr "Faltando parêntesis direito"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
@@ -2382,5 +2435,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Busca por objetos."
@@ -2505,4 +2558,6 @@
 "min-max)"
 msgstr ""
+"<b>nós:</b>... - objeto com números de nós determinado (nós:quantidade ou "
+"nós:min-max)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
@@ -2519,4 +2574,6 @@
 "12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
 msgstr ""
+"<b>marca de tempo («timestamp»):</b>... - objetos com esta marca de tempo "
+"(<b>2009-11-12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
@@ -2556,4 +2613,5 @@
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
 msgstr ""
+"Usar <b>\"</b> para comentar operadores (ex. se uma chave contem <b>:</b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:144
@@ -2562,4 +2620,6 @@
 "escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
 msgstr ""
+"Em strings entre aspas, os caracteres <b>\"</b> e <b>\\</b> necessitam ser "
+"precedidos por <b>\\</b> (ex: <b>\\\"</b> e <b>\\\\</b>)."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
@@ -2576,5 +2636,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Buscar"
@@ -2614,25 +2674,22 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "CS"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
-msgstr "CI"
+msgstr ""
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
-msgstr "RX"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2646,5 +2703,5 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2652,5 +2709,5 @@
 "chave=valor"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2674,7 +2731,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
-msgstr "Credencial de autenticação inesperada: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
@@ -2723,5 +2780,5 @@
 #, java-format
 msgid "Incorrect value of version operator: {0}. Number is expected."
-msgstr ""
+msgstr "Valor incorreto de operador de versão: {0}. Número é esperado."
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58
@@ -2730,4 +2787,6 @@
 "Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
 msgstr ""
+"Aviso: truncando automaticamente valor da etiqueta \"{0}\" no objeto apagado "
+"{1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67
@@ -2737,4 +2796,6 @@
 "length {2}. Values length is {3}."
 msgstr ""
+"O tamanho do valor para a etiqueta ''{0}''  no objeto {1} supera o máximo "
+"permitido {2}. O máximo é {3}."
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70
@@ -2792,9 +2853,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "Adicionado {0} objetos"
-msgstr[1] "Adicionado {0} objetos"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2844,12 +2905,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "Remover \"{0}\" para {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Definir {0}={1} para {2} {3}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2909,19 +2970,20 @@
 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:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Apagar Modo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Apagar {0} caminho"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Apagar {0} relação"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2999,12 +3061,12 @@
 #, java-format
 msgid "Purged object ''{0}''"
-msgstr ""
+msgstr "Eliminado objeto ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "Adicionado {0} objetos"
-msgstr[1] "Adicionado {0} objetos"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -3020,5 +3082,5 @@
 #, java-format
 msgid "Removing reference from relation {0}"
-msgstr ""
+msgstr "Eliminando referência da relação {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:57
@@ -3054,29 +3116,29 @@
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "Undelete {0} primitive"
 msgid_plural "Undelete {0} primitives"
-msgstr[0] "Desfazendo exclusão de {0} primitivas"
-msgstr[1] "Desfazendo exclusão de {0} primitivas"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for node {0}"
-msgstr "Resolver os conflictos da versão no nó {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for way {0}"
-msgstr "Resolver os conflictos da versão no caminho {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Resolver os conflictos da versão na relação {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
 #, java-format
 msgid "Resolve conflicts in node list of way {0}"
-msgstr ""
+msgstr "Resolver conflitos na lista de nós da via {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70
@@ -3155,15 +3217,15 @@
 #, java-format
 msgid "Illegal latitude value ''{0}''"
-msgstr ""
+msgstr "Valor de latitude ilegal \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/data/Bounds.java:77
 #, java-format
 msgid "Illegal longitude value ''{0}''"
-msgstr ""
+msgstr "Valor de longitude ilegal \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:342
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr ""
+msgstr "Aviso: falha ao persistir preferências para \"{0}\"."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
@@ -3256,5 +3318,5 @@
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark file ''{1}''"
-msgstr ""
+msgstr "Erro: Linha ''{0}'' inesperada em arquivo de bookmarks ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
@@ -3263,4 +3325,6 @@
 "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
 msgstr ""
+"Erro: Valor double ilegal ''{0}'' na linha ''{1}'' do arquivo de bookmark "
+"''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
@@ -3281,5 +3345,5 @@
 #, java-format
 msgid "Error: Unexpected line ''{0}'' in bookmark list from server"
-msgstr ""
+msgstr "Erro: Linha ''{0}'' inesperada na lista de bookmarks do servidor"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
@@ -3296,9 +3360,10 @@
 "{1}"
 msgstr ""
+"Falha ao carregar favoritos de \"{0}\" por razões de segurança. Exceção: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:46
 #, java-format
 msgid "Failed to load resource ''{0}'', error is {1}."
-msgstr ""
+msgstr "Falhou em carregar o recurso \"{0}\". Erro é {1}."
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:93
@@ -3312,4 +3377,6 @@
 "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
 msgstr ""
+"Aviso: número de versão do JOSM inesperada no arquivo de revisão. O valor é "
+"\"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:140
@@ -3337,5 +3404,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3343,5 +3410,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3349,5 +3416,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3355,5 +3422,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3378,5 +3445,5 @@
 #, java-format
 msgid "Missing merge target for way with id {0}"
-msgstr ""
+msgstr "Faltando alvo de mescla para via com id {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:162
@@ -3384,20 +3451,20 @@
 #, java-format
 msgid "Missing merge target for node with id {0}"
-msgstr ""
+msgstr "Faltando alvo de mescla para nó com id {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:185
 #, java-format
 msgid "Missing merge target for object with id {0}"
-msgstr ""
+msgstr "Faltando alvo de mescla para objeto com id {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:241
 #, java-format
 msgid "Missing merge target for relation with id {0}"
-msgstr ""
+msgstr "Faltando alvo de mescla para relação com id {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:246
 #, java-format
 msgid "Missing merge target of type {0} with id {1}"
-msgstr ""
+msgstr "Faltando alvo de mescla para tipo {0} com id {1}"
 
 #. should not happen
@@ -3432,15 +3499,13 @@
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "CS"
+msgstr ""
 
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
-#, fuzzy
 msgctxt "filter"
 msgid "I"
-msgstr "CI"
+msgstr ""
 
 #. column header: filter mode
@@ -3453,8 +3518,7 @@
 #. filter mode: replace
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210
-#, fuzzy
 msgctxt "filter"
 msgid "R"
-msgstr "RX"
+msgstr ""
 
 #. filter mode: add
@@ -3476,19 +3540,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+msgstr "ID > 0 esperada. Obtida {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+msgstr "Esperada Versão> 0. Obtida {0}."
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3497,5 +3561,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3503,5 +3567,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3522,5 +3586,5 @@
 #, java-format
 msgid "Cannot add node {0} to incomplete way {1}."
-msgstr ""
+msgstr "Não é possível adicionar nó {0} em uma via incompleta {1}."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:112
@@ -3624,6 +3688,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3633,5 +3697,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3642,7 +3706,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3664,5 +3728,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "segundo plano"
@@ -3718,10 +3782,10 @@
 #, java-format
 msgid "{0} ({1} to {2} degrees)"
-msgstr ""
+msgstr "{0} ({1} a {2} graus)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:252
 #, java-format
 msgid "{0} (Corsica)"
-msgstr ""
+msgstr "{0} (Corsica)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:260
@@ -3744,18 +3808,18 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:63
 msgid "PUWG (Poland)"
-msgstr ""
+msgstr "PUWG (Poland)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:106
 msgid "PUWG Zone"
-msgstr ""
+msgstr "PUWG Zone"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:170
 msgid "PUWG 1992 (Poland)"
-msgstr ""
+msgstr "PUWG 1992 (Poland)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Puwg.java:223
 #, java-format
 msgid "PUWG 2000 Zone {0} (Poland)"
-msgstr ""
+msgstr "PUWG 2000 Zone {0} (Poland)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/SwissGrid.java:88
@@ -3769,25 +3833,25 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM.java:390
 msgid "UTM Zone"
-msgstr ""
+msgstr "Zona UTM"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:25
 msgid "Guadeloupe Fort-Marigot 1949"
-msgstr ""
+msgstr "Guadeloupe Fort-Marigot 1949"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:26
 msgid "Guadeloupe Ste-Anne 1948"
-msgstr ""
+msgstr "Guadeloupe Ste-Anne 1948"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:27
 msgid "Martinique Fort Desaix 1952"
-msgstr ""
+msgstr "Martinique Fort Desaix 1952"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:386
 msgid "UTM 20N (France)"
-msgstr ""
+msgstr "UTM 20N (France)"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/UTM_20N_France_DOM.java:398
 msgid "UTM20 North Geodesic system"
-msgstr ""
+msgstr "Sistema geodésico UTM20 Norte"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:55
@@ -3795,17 +3859,18 @@
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
 msgstr ""
+"<html>Não foi possível ler favoritos de<br>''{0}''<br>O erro foi: {1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
 #, java-format
 msgid "<html>Could not write bookmark.<br>{0}</html>"
-msgstr ""
+msgstr "<html>Não foi possível gravar favorito.<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java:198
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:39
 msgid "Do not show again (remembers choice)"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+msgstr "Não mostrar novamente (lembrar escolha)"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3813,37 +3878,38 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "incompleto"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "rodovia"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "ferrovia"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "hidrovia"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "uso da terra"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3852,10 +3918,10 @@
 msgstr[1] "{0} nós"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+msgstr "transporte public"
+
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3864,9 +3930,9 @@
 msgstr[1] "{0} membros"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
 msgid "Changeset {0}"
-msgstr ""
+msgstr "Conjunto de mudanças {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:75
@@ -3896,9 +3962,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:210
 msgid "Not Found"
-msgstr ""
+msgstr "Não encontrado"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Conflito"
@@ -3906,15 +3972,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:249
 msgid "Authentication Failed"
-msgstr ""
+msgstr "Autenticação Falhou"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-#, fuzzy
-msgid "Authorization Failed"
-msgstr "Falha na conexão."
+msgid "Authorisation Failed"
+msgstr "Autorização Falhou"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
 #, fuzzy
 msgid "Authentication failed"
-msgstr "Falha na conexão."
+msgstr "Autenticação Falhou"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:299
@@ -3924,5 +3989,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:407
 msgid "Object deleted"
-msgstr ""
+msgstr "Objeto apagado"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExtendedDialog.java:481
@@ -3931,5 +3996,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java:46
 msgid "Show help information"
-msgstr ""
+msgstr "Mostrar informação de ajuda"
 
 #: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:65
@@ -3943,5 +4008,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82
 msgid "Click to close the dialog"
-msgstr ""
+msgstr "Clicar para fechar diálogo"
 
 #: ../core/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java:104
@@ -4052,4 +4117,6 @@
 msgid "Open a file (any file type that can be opened with File/Open)"
 msgstr ""
+"Abrir um arquivo (qualquer tipo de arquivo que pode ser aberto via Arquivo/"
+"Abrir)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
@@ -4075,5 +4142,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
 msgid "Set the language"
-msgstr ""
+msgstr "Definir o idioma"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86
@@ -4087,5 +4154,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:87
 msgid "Change the folder for all user settings"
-msgstr ""
+msgstr "Alterar o diretório para todas as configurações de usuário"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
@@ -4112,5 +4179,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Inicializando"
@@ -4118,9 +4184,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:171
 msgid "Updating plugins..."
-msgstr ""
+msgstr "Atualizando plugins..."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:176
 msgid "Installing updated plugins"
-msgstr ""
+msgstr "Instalando plugins atualizados"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:180
@@ -4151,5 +4217,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4160,5 +4226,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Editar"
@@ -4229,29 +4295,29 @@
 msgstr "escala"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 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:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 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:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 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:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 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:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 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:106
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 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:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4259,9 +4325,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(nenhum objeto)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4280,5 +4346,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
 msgid "Click to cancel the current operation"
-msgstr ""
+msgstr "Clique para cancelar a operação atual"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4326,23 +4392,23 @@
 msgid "Deleting {0} object"
 msgid_plural "Deleting {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Apagando {0} objeto"
+msgstr[1] "Apagando {0} objetos"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:167
 msgid "Delete objects"
-msgstr ""
+msgstr "Apagar objetos"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310
 msgid "To delete"
-msgstr ""
+msgstr "A apagar"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319
 msgid "From Relation"
-msgstr ""
+msgstr "De Relação"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33
 msgid "Pos."
-msgstr ""
+msgstr "Pos."
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:336
@@ -4423,16 +4489,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Etiquetas({0} conflitos)"
-msgstr[1] "Etiquetas({0} conflitos)"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "{0} pending tag conflict to be resolved"
 msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} conflitos de tagueamento à serem resolvidos"
-msgstr[1] "{0} conflitos de tagueamento à serem resolvidos"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
@@ -4491,16 +4557,16 @@
 msgstr "Resolução de Conflito"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr "lista em regra {0} não está participando de um par comparado"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "valor inesperado do parâmetro \"index\": {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4717,9 +4783,14 @@
 msgstr "Nó"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 "Nós mesclados ainda não congelados. Não é possível construir comando de "
 "resolução"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4747,5 +4818,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional node used by way {1}<br>which is deleted on the "
@@ -4755,11 +4826,5 @@
 "server.<br><br>Do you want to undelete these nodes too?"
 msgstr[0] ""
-"<html>Existem {0} nós adicionais usados pelo caminho {1}<br>que foram "
-"removidos do servidor.<br><br>Você deseja desfazer a remoção destes nós "
-"também?</html>"
 msgstr[1] ""
-"<html>Existem {0} nós adicionais usados pelo caminho {1}<br>que foram "
-"removidos do servidor.<br><br>Você deseja desfazer a remoção destes nós "
-"também?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
@@ -4768,5 +4833,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional primitive referred to by relation {1}<br>which is "
@@ -4776,9 +4841,5 @@
 "deleted on the server.<br><br>Do you want to undelete these too?"
 msgstr[0] ""
-"<html>Existem {0} primitivas adicionais referentes à relação {1}<br>que "
-"estão apagado no servidor.<br><br>Deseja recuperá-los também?</html>"
 msgstr[1] ""
-"<html>Existem {0} primitivas adicionais referentes à relação {1}<br>que "
-"estão apagado no servidor.<br><br>Deseja recuperá-los também?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
@@ -4881,5 +4942,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr "Não, abortar"
@@ -4927,5 +4988,10 @@
 msgstr "Primitivo"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -5022,5 +5088,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:131
 msgid "Conflicts when combining primitives"
-msgstr ""
+msgstr "Conflitos ao combinar primitivas"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:135
@@ -5036,15 +5102,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:282
 msgid "No conflicts to resolve"
-msgstr ""
+msgstr "Sem conflitos para resolver"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:273
 msgid "Cancel conflict resolution"
-msgstr ""
+msgstr "Cancelar resolução de conflito"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:359
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:288
 msgid "Apply resolved conflicts"
-msgstr ""
+msgstr "Aplicar conflitos resolvidos"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:360
@@ -5057,10 +5123,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "nenhum"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "todos os números"
@@ -5068,19 +5134,19 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:66
 msgid "Choose a value"
-msgstr ""
+msgstr "Escolher um valor"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68
 msgid "Please decide which values to keep"
-msgstr ""
+msgstr "Por favor, escolher quais valores manter"
 
 #: ../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 ""
+msgstr "O valor ''{0}'' será aplicado para a chave ''{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 ""
+msgstr "A chave ''{0}'' e todos os seus valores serão removidos"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:84
@@ -5090,7 +5156,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-#, fuzzy, java-format
+#, java-format
 msgid "Tag collection does not include the selected value ''{0}''."
-msgstr "O caminho selecionado não contém o nó selecionado."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
@@ -5099,26 +5165,26 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:268
 msgid "Not decided yet."
-msgstr ""
+msgstr "Não decidido ainda."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:49
 msgid "Tags from nodes"
-msgstr ""
+msgstr "Etiquetas de nós"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:50
 msgid "Tags from ways"
-msgstr ""
+msgstr "Etiquetas de vias"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:51
 msgid "Tags from relations"
-msgstr ""
+msgstr "Etiquetas de relações"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:78
 msgid "Conflicts in pasted tags"
-msgstr ""
+msgstr "Conflitos em etiquetas coladas"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:374
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:396
 msgid "Paste ..."
-msgstr ""
+msgstr "Colar ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:381
@@ -5136,11 +5202,11 @@
 msgid "{0} tag"
 msgid_plural "{0} tags"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} etiqueta"
+msgstr[1] "{0} etiquetas"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -5150,6 +5216,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5165,9 +5231,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:31
 msgid "Remove this relation member from the relation"
-msgstr ""
+msgstr "Remove este membro da relação"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:34
 msgid "Keep"
-msgstr ""
+msgstr "Manter"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:35
@@ -5177,9 +5243,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:38
 msgid "Undecided"
-msgstr ""
+msgstr "Não decidido"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:39
 msgid "Not decided yet"
-msgstr ""
+msgstr "Não decidido ainda"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
@@ -5189,5 +5255,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
 msgid "Enter a role for all relation memberships"
-msgstr ""
+msgstr "Escreva uma regra para todos os membros da relação"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:100
@@ -5204,9 +5270,10 @@
 msgctxt "tag"
 msgid "Key:"
-msgstr ""
+msgstr "Chave:"
 
 #: ../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>Digite a chave da tag, ex.: <strong><tt>fixme</tt></strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5218,4 +5285,6 @@
 "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
 msgstr ""
+"<html>Digite o valor da tag, ex.: <strong><tt>verifique os membros</tt></"
+"strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
@@ -5228,4 +5297,10 @@
 "place of the original way in the relation.</html>"
 msgstr ""
+"<html>Os caminhos combinados são membros de uma ou mais relações. Por favor "
+"decida se você quer <strong>manter</strong> estas associações para o caminho "
+"combinado ou se você quer <strong>removê-las</strong>.<br>O padrão é "
+"<strong>manter</strong> o primeiro caminho e <strong>remover</strong> os "
+"outros caminhos que são membros da mesma relação: o caminho combinado vai "
+"tomar o lugar do caminho original na relação.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
@@ -5241,9 +5316,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
 msgid "Apply this role to all members"
-msgstr ""
+msgstr "Aplicar regra para todos os membros"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:51
 msgid "Orig. Way"
-msgstr ""
+msgstr "Caminho Original"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:59
@@ -5257,13 +5332,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:48
 msgid "Show tags with conflicts only"
-msgstr ""
+msgstr "Mostas somente etiquetas com conflito"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:49
 msgid "Show tags with multiple values only"
-msgstr ""
+msgstr "Mostas somente etiquetas com valores múltiplos"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:161
 msgid "For selected objects only"
-msgstr ""
+msgstr "Apenas para objetos selecionados"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:162
@@ -5277,9 +5352,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:124
 msgid "Changesets"
-msgstr ""
+msgstr "Conjuntos de mudanças"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:255
 msgid "Open the list of changesets in the current layer."
-msgstr ""
+msgstr "Abre a lista de changesets na camada atual."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:300
@@ -5299,5 +5374,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:395
 msgid "Closes the selected open changesets"
-msgstr ""
+msgstr "Fecha os changesets abertos selecionados"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:426
@@ -5308,9 +5383,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:427
 msgid "Open a web page for each selected changeset"
-msgstr ""
+msgstr "Abre uma página web para cada changeset selecionado"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:466
 msgid "Details"
-msgstr ""
+msgstr "Detalhes"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:467
@@ -5329,10 +5404,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5352,18 +5427,18 @@
 msgstr "Pilha de comandos: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+msgstr "Resolver conflitos."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Resolver"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr "Abrir uma janela de união dos itens selecionados na lista acima."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5397,8 +5472,9 @@
 msgid ""
 "<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions won't be applied unless all differences<br>are "
-"resolved.Click <strong>{0}</strong> to close anyway."
-"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<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 ""
 
@@ -5414,5 +5490,5 @@
 #, java-format
 msgid "Resolve conflicts for ''{0}''"
-msgstr ""
+msgstr "Resolver conflitos para \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:49
@@ -5421,5 +5497,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5428,5 +5504,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5435,41 +5511,41 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
 msgid "Add filter."
-msgstr ""
+msgstr "Adicionar filtro."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
 msgid "Edit filter."
-msgstr ""
+msgstr "Editar filtro."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
 msgid "Delete filter."
-msgstr ""
+msgstr "Apagar filtro."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:104
 msgid "Move filter up."
-msgstr ""
+msgstr "Mover filtro para cima."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:115
 msgid "Move filter down."
-msgstr ""
+msgstr "Mover filtro para baixo."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:129
 msgid "Enable filter"
-msgstr ""
+msgstr "Habilitar filtro"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:130
 msgid "Hide elements"
-msgstr ""
+msgstr "Esconder elementos"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:132
 msgid "Apply also for children"
-msgstr ""
+msgstr "Aplicar também para filhos"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:133
 msgid "Inverse filter"
-msgstr ""
+msgstr "Inverter filtro"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:134
 msgid "Filter mode"
-msgstr ""
+msgstr "Modo Filtro"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:68
@@ -5484,5 +5560,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:254
 msgid "Object with history"
-msgstr ""
+msgstr "Objeto com histórico"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:271
@@ -5504,45 +5580,50 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:312
 msgid "Display the history of the selected objects."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+msgstr "Mostrar histórico dos objetos selecionados"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Camadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 msgid "Open a list of all loaded layers."
 msgstr "Abrir uma lista com camadas carregadas."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+msgstr "Apagar camadas selecionadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Mostrar/Ocultar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr "Ativar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr "Ativar camada selecionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr "Combinar esta camada em outra camada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Vias duplicadas"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 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:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Mover camada selecionada uma linha abaixo."
@@ -5556,6 +5637,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Relações"
@@ -5565,69 +5646,69 @@
 msgstr "Abrir uma lista de de todas as relações."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relações: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Abrir um editor para a relação selecionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Excluir a relação selecionada"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Criar uma nova relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Criar uma cópia desta relação e abri-la em outra janela de edição"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+msgstr "Selecionar membros"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+msgstr "Baixar membros"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Seleção Atual"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Abrir uma janela de seleção."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Zoom para elementos selecionados"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Zoom para seleção."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sel.: Rel.:{0} / Vias:{1} / Nós:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5635,5 +5716,5 @@
 msgstr "Seleção"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5668,6 +5749,6 @@
 msgid "{0} Author"
 msgid_plural "{0} Authors"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} Autor"
+msgstr[1] "{0} Autores"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:150
@@ -5694,9 +5775,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:218
 msgid "Missing encoding"
-msgstr ""
+msgstr "Falta de codificação"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:268
 msgid "<new object>"
-msgstr ""
+msgstr "<novo objeto>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:281
@@ -5710,13 +5791,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:179
 msgid "Display the basic properties of the changeset"
-msgstr ""
+msgstr "Exibir propriedades básicas do changeset"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:181
 msgid "Display the tags of the changeset"
-msgstr ""
+msgstr "Exibe as etiquetas do changeset"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:182
 msgid "Content"
-msgstr ""
+msgstr "Conteúdo"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:183
@@ -5732,5 +5813,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:163
 msgid "Query"
-msgstr ""
+msgstr "Consulta"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:358
@@ -5741,5 +5822,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:265
 msgid "Remove from cache"
-msgstr ""
+msgstr "Remove do cache"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:383
@@ -5749,10 +5830,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:410
 msgid "Close the selected changesets"
-msgstr ""
+msgstr "Fecha os changesets selecionados"
 
 #: ../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 ""
+msgstr "Atualizar changeset"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:450
@@ -5762,5 +5843,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:475
 msgid "Download changeset content"
-msgstr ""
+msgstr "Baixar o conteúdo do changeset"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:477
@@ -5770,5 +5851,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:510
 msgid "My changesets"
-msgstr ""
+msgstr "Meus changesets"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:512
@@ -5786,5 +5867,5 @@
 msgctxt "changeset.upload-comment"
 msgid "empty"
-msgstr ""
+msgstr "vazio"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:62
@@ -5792,5 +5873,5 @@
 msgctxt "changeset.state"
 msgid "Open"
-msgstr ""
+msgstr "Aberto"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:64
@@ -5798,5 +5879,5 @@
 msgctxt "changeset.state"
 msgid "Closed"
-msgstr ""
+msgstr "Fechado"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:73
@@ -5804,13 +5885,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:154
 msgid "anonymous"
-msgstr ""
+msgstr "anônimo"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:30
 msgid "Comment"
-msgstr ""
+msgstr "Comentário"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:38
 msgid "Open"
-msgstr ""
+msgstr "Aberto"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:46
@@ -5821,9 +5902,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:54
 msgid "Created at"
-msgstr ""
+msgstr "Criado em"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java:62
 msgid "Closed at"
-msgstr ""
+msgstr "Fechado em"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:69
@@ -5833,15 +5914,15 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:179
 msgid "Downloading changeset content"
-msgstr ""
+msgstr "Baixando conteúdo do changeset"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:170
 #, java-format
 msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr ""
+msgstr "({0}/{1}) Baixando changeset {2}..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java:177
 #, java-format
 msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr ""
+msgstr "({0}/{1}) Baixando conteúdo do changeset {2}..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:176
@@ -5850,5 +5931,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:306
 msgid "Download content"
-msgstr ""
+msgstr "Baixar conteúdo"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:178
@@ -5857,10 +5938,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:308
 msgid "Download the changeset content from the OSM server"
-msgstr ""
+msgstr "Baixar o conteúdo do servidor 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 ""
+msgstr "Atualizar conteúdo"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:201
@@ -5872,5 +5953,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:241
 msgid "Show history"
-msgstr ""
+msgstr "Exibir histórico"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250
@@ -5881,5 +5962,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:356
 msgid "Select in layer"
-msgstr ""
+msgstr "Selecionar na camada"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:317
@@ -5902,10 +5983,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:370
 msgid "Nothing to select"
-msgstr ""
+msgstr "Nada para selecionar"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:377
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:425
 msgid "Zoom to in layer"
-msgstr ""
+msgstr "Aproximar na camada"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379
@@ -5916,5 +5997,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:439
 msgid "Nothing to zoom to"
-msgstr ""
+msgstr "Nada para aproximar"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:446
@@ -5924,25 +6005,25 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:464
 msgid "Download now"
-msgstr ""
+msgstr "Baixar agora"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
 msgid "Download the changeset content"
-msgstr ""
+msgstr "Baixar o conteúdo do changeset"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:50
 msgid "Created"
-msgstr ""
+msgstr "Criado"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:51
 msgid "Updated"
-msgstr ""
+msgstr "Atualizado"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:52
 msgid "Deleted"
-msgstr ""
+msgstr "Removido"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:32
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 #. item "Highways/Streets/Motorway" text "Reference"
@@ -5985,8 +6066,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -6058,4 +6137,7 @@
 #. <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 />
@@ -6134,6 +6216,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6175,6 +6258,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6643,152 +6728,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Nome"
@@ -6796,25 +6883,25 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:115
 msgid "ID:"
-msgstr ""
+msgstr "ID:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:128
 msgid "Comment:"
-msgstr ""
+msgstr "Comentário:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:143
 msgid "Open/Closed:"
-msgstr ""
+msgstr "Aberto/Fechado:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:155
 msgid "Created by:"
-msgstr ""
+msgstr "Criado por:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:168
 msgid "Created on:"
-msgstr ""
+msgstr "Criado em:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:180
 msgid "Closed on:"
-msgstr ""
+msgstr "Fechado em:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:267
@@ -6850,26 +6937,26 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java:127
 msgid "Download changesets"
-msgstr ""
+msgstr "Baixar changesets"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36
 #, java-format
 msgid "{0} [incomplete]"
-msgstr ""
+msgstr "{0} [incompleta]"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41
 msgid "open"
-msgstr ""
+msgstr "aberto"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:41
 msgid "closed"
-msgstr ""
+msgstr "fechado"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:45
 msgid "Changeset ID: "
-msgstr ""
+msgstr "ID do changeset: "
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:47
 msgid "Enter a changset id"
-msgstr ""
+msgstr "Digite o ID do changeset"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:79
@@ -6887,5 +6974,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:996
 msgid "Please enter an integer value > 0"
-msgstr ""
+msgstr "Por favor digite um valor iteiro > 0"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
@@ -6908,29 +6995,29 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
 msgid "Query open changesets only"
-msgstr ""
+msgstr "Buscar somente conjuntos de modificações abertos"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:311
 msgid "Query closed changesets only"
-msgstr ""
+msgstr "Buscar somente conjuntos de modificações fechados"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:320
 msgid "Query both open and closed changesets"
-msgstr ""
+msgstr "Buscar conjuntos de modificações abertos e fechados"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389
 msgid "User ID:"
-msgstr ""
+msgstr "ID do usuário:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409
 msgid "User name:"
-msgstr ""
+msgstr "Nome do usuário:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445
 msgid "Only changesets owned by myself"
-msgstr ""
+msgstr "Somente conjuntos de modificações meus"
 
 #: ../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 ""
+msgstr "Somente conjuntos de modificações do usuário com o seguinte ID"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
@@ -6960,5 +7047,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554
 msgid "Invalid user ID"
-msgstr ""
+msgstr "ID de usuário inválido"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563
@@ -6968,22 +7055,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:564
 msgid "Invalid user name"
-msgstr ""
+msgstr "Nome do usuário inválido"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:656
 msgid "Date: "
-msgstr ""
+msgstr "Data: "
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:684
 msgid "Closed after - "
-msgstr ""
+msgstr "Fechado depois de - "
 
 #: ../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 ""
+msgstr "Data:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
-msgstr ""
+msgstr "Criado antes de - "
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
@@ -7025,5 +7112,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
 msgid "Invalid bounding box"
-msgstr ""
+msgstr "Retângulo de seleção inválido"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
@@ -7085,5 +7172,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:54
 msgid "From URL"
-msgstr ""
+msgstr "Da URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:55
@@ -7094,5 +7181,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
 msgid "Advanced"
-msgstr ""
+msgstr "Avançado"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
@@ -7135,5 +7222,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:42
 msgid "URL: "
-msgstr ""
+msgstr "URL: "
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
@@ -7143,5 +7230,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
 msgid "Examples"
-msgstr ""
+msgstr "Exemplos"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
@@ -7171,5 +7258,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<diferente>"
@@ -7224,55 +7311,55 @@
 msgstr "Adicionar Propriedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Propriedades: {0} / Membros: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Propriedades / Associações"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Modificar relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "Deletar da relação"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Confirmar a exclusão da relação {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Excluir a chave selecionada em todos objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "Excluir Propriedades"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Adicionar um novo par chave/valor para todos objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editar o valor da chave selecionada para todos objetos"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+msgstr "Selecionar relação"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+msgstr "Selecionar na lista de relações"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7288,5 +7375,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:223
 msgid "Download All Children"
-msgstr ""
+msgstr "baixar todos os Filhos"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:242
@@ -7347,10 +7434,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45
 msgid "Download relations"
-msgstr ""
+msgstr "Baixar relações"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79
 #, java-format
 msgid "({0}/{1}): Downloading relation ''{2}''..."
-msgstr ""
+msgstr "({0}/{1}): Baixando relação ''{2}''..."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:149
@@ -7365,9 +7452,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152
 msgid "Child Relations"
-msgstr ""
+msgstr "Relações-filho"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:292
 msgid "Apply Role:"
-msgstr ""
+msgstr "Aplicar papel:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:294
@@ -7473,5 +7560,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883
 msgid "Sort"
-msgstr ""
+msgstr "Classificar"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884
@@ -7481,13 +7568,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
 msgid "Reverse the order of the relation members"
-msgstr ""
+msgstr "Reverter a ordem dos membros da relação"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
 msgid "Reverse"
-msgstr ""
+msgstr "Inverter"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
 msgid "Relation Editor: Reverse"
-msgstr ""
+msgstr "Editor de Relações: Inverter"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927
@@ -7520,9 +7607,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984
 msgid "Delete the currently edited relation"
-msgstr ""
+msgstr "Apagar a relação editada atual"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1074
 msgid "Yes, create a conflict and close"
-msgstr ""
+msgstr "Sim, crie um conflito e feche"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
@@ -7532,5 +7619,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1080
 msgid "No, continue editing"
-msgstr ""
+msgstr "Não, continuar editando"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
@@ -7555,5 +7642,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1120
 msgid "Apply the current updates"
-msgstr ""
+msgstr "Aplciar as atualizações correntes"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1153
@@ -7571,5 +7658,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1217
 msgid "Download all incomplete members"
-msgstr ""
+msgstr "Baixar todos os membros incompletos"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
@@ -7612,5 +7699,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
 msgid "Yes, apply it"
-msgstr ""
+msgstr "Sim, aplique"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1315
@@ -7620,5 +7707,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1321
 msgid "Confirm empty role"
-msgstr ""
+msgstr "Confirme papel vazio"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1389
@@ -7698,73 +7785,74 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:115
 msgid "Load relation"
-msgstr ""
+msgstr "Carregar relação"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr "Aviso: ignorando exceção porque tarefa foi cancelada. Exceção: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
 msgid "way is connected"
-msgstr ""
+msgstr "caminho está conectado"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:75
 msgid "way is connected to previous relation member"
-msgstr ""
+msgstr "o caminho está conectado ao membro anterior da relação"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:78
 msgid "way is connected to next relation member"
-msgstr ""
+msgstr "a via está conectada ao membro posterior da relação"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:81
 msgid "way is not connected to previous or next relation member"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+msgstr "a via não está conectada ao membro anterior ou posterior da relação"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Favoritos"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+msgstr "Criar favorito"
+
+#: ../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:187
+msgstr "Adicionar um favotiro para a área de download atual selecionada"
+
+#: ../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:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+"Atualmente, não há área de download selecionada. Por favor, selecione uma "
+"área primeiro."
+
+#: ../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:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+msgstr "Entre com um nome para o favorito da área de download."
+
+#: ../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:212
+msgstr "Nome de local"
+
+#: ../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:237
+msgstr "Remover favoritos que estão selecionados"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
-msgstr ""
+msgstr "Renomear o favorito selecionado"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104
@@ -7800,22 +7888,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
-#, fuzzy, java-format
+#, java-format
 msgid "The string ''{0}'' is not a valid double value."
-msgstr "parametro ''{0}'' não é um tipo válido para nome, obtido ''{1}''"
+msgstr ""
 
 #: ../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 ""
+msgstr "Requerido valor de latitude no intervalo [-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 ""
+msgstr "Requerido valor de longitude no intervalo [-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 ""
+msgstr "Colar URL da área de transferência"
 
 #. adding the download tasks
@@ -7831,4 +7919,5 @@
 msgid "Select to download OSM data in the selected download area."
 msgstr ""
+"Selecione para baixar dados do OSM para a área de download selecionada."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:98
@@ -7839,4 +7928,5 @@
 msgid "Select to download GPS traces in the selected download area."
 msgstr ""
+"Selecione para baixar trilhas GPS do OSM para a área de download selecionada."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:119
@@ -7856,5 +7946,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:215
 msgid "No area selected yet"
-msgstr ""
+msgstr "Não há área selecionada ainda"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:218
@@ -7870,13 +7960,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:374
 msgid "Click to close the dialog and to abort downloading"
-msgstr ""
+msgstr "Clique para fechar o diálogo e para abortar o download"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:391
 msgid "Click do download the currently selected area"
-msgstr ""
+msgstr "Clique para baixar a área selecionada atualmente"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:398
 msgid "Please select a download area first."
-msgstr ""
+msgstr "Por favor, selecione uma área a baixar primeiro."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:407
@@ -7887,58 +7977,58 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+msgstr "Tipo de Classe"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+msgstr "Limites"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+msgstr "Perto"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
-msgstr ""
+msgstr "Ampliar"
 
 #: ../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:108
+msgstr "Escolha servidor para busca:"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
 msgid "Enter a place name to search for:"
 msgstr "Forneça o nome de um lugar a procurar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+#: ../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:147
+msgstr "Entre com um nome de local para buscar"
+
+#: ../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:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Null pointer exception, provavelmente faltam algumas tags."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+msgstr "Buscar ..."
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+msgstr "Clique para começar a buscar locais"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+msgstr "Consultando o servidor de nomes"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
-msgstr ""
+msgstr "Consultando o servidor de nomes ..."
 
 #. item "Highways/Streets/Roundabout" label "Edit Junction"
@@ -7947,7 +8037,9 @@
 #. 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" />
@@ -7956,10 +8048,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Tipo"
@@ -7968,5 +8061,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -7978,17 +8071,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "Desconhecido"
@@ -8033,5 +8125,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:185
 msgid "JOSM Help Browser"
-msgstr ""
+msgstr "Navegador de Help do JOSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
@@ -8065,15 +8157,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:354
 msgid "Failed to open URL"
-msgstr ""
+msgstr "Falha ao abrir URL"
 
 #. putValue(NAME, tr("Open in Browser"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:387
 msgid "Open the current help page in an external browser"
-msgstr ""
+msgstr "Abrir página atual de ajuda em browser externo"
 
 #. putValue(NAME, tr("Edit"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:399
 msgid "Edit the current help page"
-msgstr ""
+msgstr "Editar página de ajuda atual"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:406
@@ -8087,20 +8179,20 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:429
 msgid "Reload the current help page"
-msgstr ""
+msgstr "Atualizar a página de ajuda atual"
 
 #. putValue(NAME, tr("Back"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:444
 msgid "Go to the previous page"
-msgstr ""
+msgstr "Ir para página anterior"
 
 #. putValue(NAME, tr("Forward"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:464
 msgid "Go to the next page"
-msgstr ""
+msgstr "Ir para próxima página"
 
 #. putValue(NAME, tr("Home"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:480
 msgid "Go to the JOSM help home page"
-msgstr ""
+msgstr "Ir para página inicial da ajuda do JOSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511
@@ -8111,40 +8203,40 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561
 msgid "Failed to open help page. The target URL is empty."
-msgstr ""
+msgstr "Falha ao abrir página de ajuda. O URL de destino está vazio."
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:562
 msgid "Failed to open help page"
-msgstr ""
+msgstr "Falha ao abrir página de ajuda."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:182
 msgid "Latitude: "
-msgstr ""
+msgstr "Latitude: "
 
 #: ../core/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java:200
 msgid "Longitude: "
-msgstr ""
+msgstr "Longitude: "
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136
 msgid "Coordinates"
-msgstr ""
+msgstr "Coordenadas"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48
 #, java-format
 msgid "History for node {0}"
-msgstr ""
+msgstr "Histórico para nó {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49
 #, java-format
 msgid "History for way {0}"
-msgstr ""
+msgstr "Histórico para via {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50
 #, java-format
 msgid "History for relation {0}"
-msgstr ""
+msgstr "Histórico para relação {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:143
 msgid "Reload the history from the server"
-msgstr ""
+msgstr "Recarregar histórico do servidor"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:274
@@ -8189,15 +8281,15 @@
 #, java-format
 msgid "Loading history for node {0}"
-msgstr ""
+msgstr "Carregando histórico para nó {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:187
 #, java-format
 msgid "Loading history for way {0}"
-msgstr ""
+msgstr "Carregando histórico para via {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:188
 #, java-format
 msgid "Loading history for relation {0}"
-msgstr ""
+msgstr "Carregando histórico para relação {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44
@@ -8209,5 +8301,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195
 msgid "Zoom to node"
-msgstr ""
+msgstr "Zoom no nó"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:196
@@ -8227,14 +8319,14 @@
 #, java-format
 msgid "Relation {0}"
-msgstr ""
+msgstr "Relação {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 ""
+msgstr "não presente"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:55
 msgid "Changeset"
-msgstr ""
+msgstr "Conjunto de modificações"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:91
@@ -8252,5 +8344,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
 msgid "Changeset info"
-msgstr ""
+msgstr "Informações do changeset"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:120
@@ -8261,5 +8353,5 @@
 #, java-format
 msgid "Show changeset {0}"
-msgstr ""
+msgstr "Exibir changeset {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:62
@@ -8280,5 +8372,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:108
 msgid "[deleted]"
-msgstr ""
+msgstr "[apagado]"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:118
@@ -8345,5 +8437,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr "Conflitos detectados"
@@ -8384,5 +8476,5 @@
 #, java-format
 msgid "Click to download all parent ways for node {0}"
-msgstr ""
+msgstr "Clique para baixar todas as vias que contém o nó {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:222
@@ -8412,5 +8504,5 @@
 #, java-format
 msgid "Warning: error header \"{0}\" did not match with an expected pattern"
-msgstr ""
+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:46
@@ -8424,13 +8516,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:33
 msgid "Changeset id:"
-msgstr ""
+msgstr "ID do chengeset:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:36
 msgid "Created at:"
-msgstr ""
+msgstr "Criado em:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:39
 msgid "Changeset comment:"
-msgstr ""
+msgstr "Comentário do changeset:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:67
@@ -8483,9 +8575,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88
 msgid "Open changesets"
-msgstr ""
+msgstr "Abrir changesets"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:119
 msgid "Close changesets"
-msgstr ""
+msgstr "Fechar changesets"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:121
@@ -8499,10 +8591,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:38
 msgid "Closing changeset"
-msgstr ""
+msgstr "Fechando changeset"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java:76
 #, java-format
 msgid "Closing changeset {0}"
-msgstr ""
+msgstr "Fechar changeset {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99
@@ -8566,13 +8658,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279
 msgid "Authenticate"
-msgstr ""
+msgstr "Autenticar"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280
 msgid "Authenticate with the supplied username and password"
-msgstr ""
+msgstr "Autenticar com nome de usuário e senha providos"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293
 msgid "Cancel authentication"
-msgstr ""
+msgstr "Cancelar autenticação"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:63
@@ -8598,9 +8690,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:924
 msgid "Launch a file chooser to select a file"
-msgstr ""
+msgstr "Lança diálogo para escolha de arquivo"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:144
 msgid "Select filename"
-msgstr ""
+msgstr "Selecionar nome de arquivo"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:44
@@ -8618,9 +8710,10 @@
 msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
 msgstr ""
+"A camada ''{0}'' tem modificações que deveriam ser enviadas ao servidor."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49
 #, java-format
 msgid "Layer ''{0}'' has no modifications to be uploaded."
-msgstr ""
+msgstr "A camada ''{0}'' não tem modificações a ser enviadas ao servidor."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60
@@ -8630,22 +8723,24 @@
 "''{1}''."
 msgstr ""
+"A camada ''{0}'' tem modificações que deveriam ser salvas no seu arquivo "
+"associado \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62
 #, java-format
 msgid "Layer ''{0}'' has no modifications to be saved."
-msgstr ""
+msgstr "A camada ''{0}'' não tem modificações a ser salvas."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:80
 msgid "No file associated with this layer"
-msgstr ""
+msgstr "Não há arquivo associado com esta camada"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83
 msgid "Please select a file"
-msgstr ""
+msgstr "Por favor, selecione um arquivo"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86
 #, java-format
 msgid "Layer ''{0}'' is not backed by a file"
-msgstr ""
+msgstr "A camada ''{0}'' não está salvo em um arquivo."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:101
@@ -8653,4 +8748,5 @@
 msgid "File ''{0}'' is not writable. Please enter another file name."
 msgstr ""
+"Arquivo ''{0}'' não é gravável. Por favor, entre com outro nome de arquivo."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109
@@ -8663,17 +8759,17 @@
 #, java-format
 msgid "Saving layer to ''{0}'' ..."
-msgstr ""
+msgstr "Salvando camada para ''{0}'' ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:114
 msgid "Unsaved changes - Save/Upload before exiting?"
-msgstr ""
+msgstr "Modificações não salvas - Salvar/Enviar antes de sair?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:120
 msgid "Unsaved changes - Save/Upload before deleting?"
-msgstr ""
+msgstr "Modificações não salvas - Salvar/Enviar antes de apagar?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:140
 msgid "Uploading and saving modified layers ..."
-msgstr ""
+msgstr "Enviando e salvando camadas modificadas..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
@@ -8690,5 +8786,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:206
 msgid "Unsaved data and conflicts"
-msgstr ""
+msgstr "Dados e conflitos não-salvos"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
@@ -8739,5 +8835,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
 msgid "Discard and Delete"
-msgstr ""
+msgstr "Descartar e Deletar"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
@@ -8779,5 +8875,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500
 msgid "Incomplete upload and/or save"
-msgstr ""
+msgstr "Envio e/ou gravação incompleta"
 
 #. item "Highways/Streets/Motorway" text "Name"
@@ -8796,9 +8892,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8808,7 +8904,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -8820,16 +8916,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "Layer"
@@ -8837,9 +8933,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28
 msgid "Should upload?"
-msgstr ""
+msgstr "Enviar?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36
 msgid "Should save?"
-msgstr ""
+msgstr "Salvar?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44
@@ -8858,13 +8954,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:106
 msgid "Initializing nodes to update ..."
-msgstr ""
+msgstr "Inicializando nós a atualizar..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:122
 msgid "Initializing ways to update ..."
-msgstr ""
+msgstr "Inicializando via a atualizar..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:131
 msgid "Initializing relations to update ..."
-msgstr ""
+msgstr "Inicializando relações a atualizar..."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:116
@@ -8879,5 +8975,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:451
 msgid "Tags of new changeset"
-msgstr ""
+msgstr "Etiquetas para novo conjunto de modificações"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:121
@@ -8891,5 +8987,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Configure advanced settings"
-msgstr ""
+msgstr "Configurar definições avançadas"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:170
@@ -8897,5 +8993,5 @@
 #, java-format
 msgid "Upload to ''{0}''"
-msgstr ""
+msgstr "Enviar para ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:358
@@ -8905,5 +9001,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:360
 msgid "Upload the changed primitives"
-msgstr ""
+msgstr "Enviar primitivas modificadas"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:366
@@ -8913,5 +9009,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:367
 msgid "Illegal upload comment"
-msgstr ""
+msgstr "Comentário de envio inválido"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:376
@@ -9038,9 +9134,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:92
 msgid "Abort"
-msgstr ""
+msgstr "Abortar"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:94
 msgid "Click to abort uploading"
-msgstr ""
+msgstr "Clique para abortar envio"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:99
@@ -9070,5 +9166,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123
 msgid "Changeset is full"
-msgstr ""
+msgstr "Conjunto de modificações está cheio"
 
 #. we tried to delete an already deleted primitive.
@@ -9115,9 +9211,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:113
 msgid "Select objects to upload"
-msgstr ""
+msgstr "Selecionar objetos para enviar"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:266
 msgid "Cancel uploading"
-msgstr ""
+msgstr "Cancelar envio"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategy.java:86
@@ -9125,4 +9221,5 @@
 msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
 msgstr ""
+"Aviso: valor inesperado para chave ''{0}'' em preferências, obtido ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94
@@ -9133,13 +9230,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343
 msgid "Upload data in one request"
-msgstr ""
+msgstr "Enviar dados em um chamado"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131
 msgid "Upload data in chunks of objects. Chunk size: "
-msgstr ""
+msgstr "Enviar dados em grupos de objetos. Tamanho do grupo: "
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158
 msgid "Upload each object individually"
-msgstr ""
+msgstr "Enviar cada objeto individualmente"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
@@ -9237,6 +9334,6 @@
 msgid "{0} object to modify:"
 msgid_plural "{0} objects to modify:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} objeto a modificar:"
+msgstr[1] "{0} objetos a modificar:"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:113
@@ -9247,68 +9344,68 @@
 msgstr[1] "{0} objectos a apagar:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "ponto GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Personalizar linha"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../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:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Personalizar cores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Padrão"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Selecionar uma cor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr "Marcadores de Pontos Nomeados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Importar Áudio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9318,23 +9415,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Árquivos de Áudio WAV (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Marcadores de audio de {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Importar imagens"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9344,5 +9441,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9350,5 +9447,5 @@
 msgstr "Nome: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9356,5 +9453,5 @@
 msgstr "Descrição: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9364,23 +9461,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "Descrição"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Comprimento: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9389,5 +9486,5 @@
 msgstr[1] "{0} rotas, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9396,10 +9493,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Converter para camada de dados"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9409,43 +9506,43 @@
 "arriscado.<br> Se quiser enviar dados, consulte aqui:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces (EN)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Convertido de: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "Descarregar do OSM ao largo desta via"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Descargar tudo entre:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metros"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "Área máxima por pedio:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km²"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9456,9 +9553,9 @@
 "Você deseja </br> continuar? </html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 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:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9466,5 +9563,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9472,23 +9569,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Camada de dados {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "fora da área baixada"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr "versão {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 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:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9497,5 +9594,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9509,5 +9606,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9520,11 +9617,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9533,32 +9630,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} consiste em:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr "remover definição"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr "Versão API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Converter para camada GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9605,28 +9702,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "ponto"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Arcivo GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Erro enquanto analisava {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, 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:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9635,34 +9731,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+msgstr " [dd/mm/yyyy hh:mm:ss]"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "Sem data"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9670,64 +9766,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "Data inválida"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+msgstr "Trilha GPX: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+msgstr "Ajuste manual"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+msgstr "Timezone: "
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr "Deslocamento:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+msgstr "Nenhum gpx selecionado"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9737,52 +9833,52 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+msgstr "Correlacione"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+msgstr "Offset inválido"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+msgstr "Tentar novamente"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+msgstr "Timezone: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+msgstr "Minutos: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+msgstr "Segundos: {0}"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
 msgid_plural "Time difference of {0} days"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+msgstr[0] "(Diferença de {0} dia)"
+msgstr[1] "Diferença de {0} dias"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9790,41 +9886,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 msgid "The selected photos do not contain time information."
-msgstr "O caminho selecionado não contém o nó selecionado."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
 "one."
-msgstr "O caminho selecionado não contém o nó selecionado."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9833,5 +9927,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9840,63 +9934,63 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+msgstr "Extrair coordenadas GPS do EXIF"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+msgstr "Ler fotos..."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Lendo {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Imagens Geotagueadas"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+msgstr "Correlacionar com GPX"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "Sem dados carregados."
-msgstr[1] "Sem dados carregados."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -9905,10 +9999,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+msgstr "Remover arquivo de imagem do disco"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -9917,7 +10011,7 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
-msgstr ""
+msgstr "O arquivo de imagem não pode ser removido."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:441
@@ -9928,5 +10022,5 @@
 #, java-format
 msgid "Loading {0}"
-msgstr ""
+msgstr "Carregando {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:453
@@ -9934,5 +10028,5 @@
 #, java-format
 msgid "Error on file {0}"
-msgstr ""
+msgstr "Erro no arquivo {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
@@ -9947,5 +10041,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88
 msgid "Show previous Image"
-msgstr ""
+msgstr "Mostrar imagem anterior"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:88
@@ -9963,5 +10057,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:110
 msgid "Delete File from disk"
-msgstr ""
+msgstr "Apagar arquivo do disco"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:117
@@ -9972,9 +10066,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:121
 msgid "Show next Image"
-msgstr ""
+msgstr "Mostrar a próxima imagem"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:128
 msgid "Center view"
-msgstr ""
+msgstr "Centralizar vista"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:131
@@ -10010,5 +10104,5 @@
 msgstr "Marcador gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10016,5 +10110,5 @@
 msgstr[1] "marcadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10023,9 +10117,9 @@
 msgstr[1] "{0} consiste em {1} marcadores"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "Sincronizar audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10034,20 +10128,20 @@
 "sincronização"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr "Audio sincronizado no ponto {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -10055,17 +10149,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Mostrar/Esconder Texto/Ícones"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 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/PlayHeadMarker.java:171
+#: ../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 "
@@ -10073,5 +10167,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -10079,5 +10173,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "Não foi possível criar um novo marcador de áudio."
@@ -10103,5 +10197,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
 #, java-format
 msgid ""
@@ -10109,5 +10203,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
 #, java-format
 msgid ""
@@ -10159,8 +10253,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize URL:"
-msgstr "Autor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10184,13 +10276,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:58
 msgid "Fully automatic"
-msgstr ""
+msgstr "Automático"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:61
 msgid "Semi-automatic"
-msgstr ""
+msgstr "Semi-automático"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:64
 msgid "Manual"
-msgstr ""
+msgstr "Manual"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:73
@@ -10220,10 +10312,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40
 msgid "Username: "
-msgstr ""
+msgstr "Nome do Usuário: "
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:127
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54
 msgid "Password: "
-msgstr ""
+msgstr "Senha: "
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:175
@@ -10250,8 +10342,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize now"
-msgstr "Autor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10273,5 +10363,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:355
 msgid "Test Access Token"
-msgstr ""
+msgstr "Teste o token de acesso"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:409
@@ -10279,5 +10369,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
 msgid "Please enter your OSM user name"
-msgstr ""
+msgstr "Por favor digite o seu nome de usuário no OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:411
@@ -10310,7 +10400,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
-#, fuzzy
 msgid "OAuth authorization failed"
-msgstr "Falha na conexão."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
@@ -10340,13 +10429,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:97
 msgid "Save Access Token to preferences"
-msgstr ""
+msgstr "Salvar token de acesso nas preferências"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:118
 msgid "Access Token"
-msgstr ""
+msgstr "Token de acesso"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:119
 msgid "Advanced OAuth parameters"
-msgstr ""
+msgstr "Parâmetros avançados do OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:121
@@ -10390,8 +10479,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
-#| msgid "Please select at least four nodes."
 msgid "Please select an authorization procedure: "
-msgstr "Por favor, selecione no mínimo 4 nós."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10401,8 +10488,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
-#, fuzzy
-#| msgid "Close dialog and cancel downloading"
 msgid "Close the dialog and cancel authorization"
-msgstr "Feche a mensagem e cancele a transferência"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
@@ -10463,5 +10548,5 @@
 #, java-format
 msgid "Logging out session ''{0}''..."
-msgstr ""
+msgstr "Encerrando sessão \"{0}\"..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
@@ -10501,5 +10586,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
 msgid "Allow to write your preferences"
-msgstr ""
+msgstr "Permite que você escreva suas preferências"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
@@ -10519,5 +10604,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
 msgid "Request Failed"
-msgstr ""
+msgstr "A requisição falhou"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
@@ -10716,5 +10801,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Por favor, selecione a linha para editar."
@@ -10728,5 +10813,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10874,9 +10959,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "Camada: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -10906,6 +10986,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr "Tudo"
@@ -10944,8 +11024,8 @@
 msgstr "Cor única (pode ser personalizado para camadas nomeadas)"
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Carro"
@@ -10967,13 +11047,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Bicicleta"
@@ -11006,12 +11086,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "A Pé"
@@ -11569,5 +11649,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ShortcutPreference.java:44
 msgid "Shortcut"
-msgstr ""
+msgstr "Atalho"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:155
@@ -11967,5 +12047,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -11973,18 +12060,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "Atributos opcionais:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr "via sem saída"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Tipo desconhecido: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -11995,16 +12082,16 @@
 msgstr "Não foi possível ler a fonte de preferência de tags: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Erro analisando {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, 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:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -12013,18 +12100,17 @@
 msgstr[1] "Modificar objetos {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "Nada selecionado!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "Seleção inadequada!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "Aplicar Preferência"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Alterar propriedades"
@@ -12300,6 +12386,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12324,9 +12410,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Erro de interpretação: estrutura inválida para documento gpx"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12349,8 +12435,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, fuzzy, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+"Falha ao carregar favoritos de \"{0}\" por razões de segurança. Exceção: {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
@@ -12421,5 +12514,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "Coordenadas importadas: "
@@ -12520,9 +12613,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Enviando {0} objetos..."
-msgstr[1] "Enviando {0} objetos..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -13050,9 +13143,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159
-#, fuzzy, java-format
+#, java-format
 msgid "({0}/{1}) Uploading {2} object..."
 msgid_plural "({0}/{1}) Uploading {2} objects..."
-msgstr[0] "Enviando {0} objetos..."
-msgstr[1] "Enviando {0} objetos..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
@@ -13150,5 +13243,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -13156,6 +13249,6 @@
 "Plugin {0} requires {1} plugins which were not found. The missing plugins "
 "are:"
-msgstr[0] "O plugin {0} é requerido pelo plugin {1} mas não foi encontrado."
-msgstr[1] "O plugin {0} é requerido pelo plugin {1} mas não foi encontrado."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13247,5 +13340,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:722
 msgid "Keep plugin"
-msgstr ""
+msgstr "Manter plugin"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:631
@@ -13421,5 +13514,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13427,8 +13519,4 @@
 "file a bug report."
 msgstr ""
-"Uma exceção não esperada aconteceu.\n"
-"\n"
-"Isto é sempre um erro de programação. Se estiver rodando\n"
-"a ultima versão do JOSM, por favor, reporte um bug."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13467,5 +13555,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:151
 msgid "You have encountered a bug in JOSM"
-msgstr ""
+msgstr "Você encontrou um bug no JOSM"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:41
@@ -13522,6 +13610,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -13641,6 +13729,6 @@
 "{1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13649,5 +13737,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -13795,4 +13883,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr "Visibilidade"
@@ -13808,5 +13897,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:140
 msgid "(What does that mean?)"
-msgstr ""
+msgstr "(O que isso significa?)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:143
@@ -13834,5 +13923,5 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:239
 msgid "Upload cancelled"
-msgstr ""
+msgstr "Envio cancelado"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:249
@@ -13883,5 +13972,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "Interpolação de Endereços"
@@ -14201,5 +14290,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:83
 msgid "Source"
-msgstr ""
+msgstr "Fonte"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:89
@@ -14462,5 +14551,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr "Localidade"
@@ -14617,21 +14706,21 @@
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr "Arcivo TCX (*.tcx)"
@@ -14663,9 +14752,9 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -14680,13 +14769,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr ""
@@ -14695,6 +14784,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr ""
@@ -14920,17 +15009,17 @@
 msgstr "Carregar grupo de imagens como nova camada."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../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:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -14974,42 +15063,41 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "leste"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "nordeste"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "norte"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "noroeste"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "oeste"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "sudoeste"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "sul"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "sudeste"
@@ -15065,6 +15153,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -15073,73 +15161,73 @@
 msgstr "água"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "costa"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "ilha"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../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:43
+#: ../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:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Valor máximo de cinza para se considerar como água (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../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:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../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:55
+#: ../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:57
+#: ../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:59
+#: ../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:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../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:67
+#: ../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:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -15147,5 +15235,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -15153,5 +15241,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -15159,58 +15247,58 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../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:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr "Marcar caminhos como água, litoral, terra ou nenhum. Padrão é água."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../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:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr ""
@@ -15234,5 +15322,5 @@
 msgstr "Conexão falhou"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr "sem nome"
@@ -15263,5 +15351,5 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr ""
@@ -15335,5 +15423,5 @@
 msgstr ""
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr ""
@@ -15592,4 +15680,74 @@
 msgstr ""
 
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+msgid "Read error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Digite as coordenadas do novo nó."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Não foi possível fazer backup do arquivo."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Erro"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "O arquivo de imagem não pode ser removido."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Não foi possível renomear arquivo ''{0}''"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Não foi possível fazer backup do arquivo."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+msgid "Keep old backups and continue"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Sobrescrever"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+#, fuzzy
+msgid "Could not delete temporary file!"
+msgstr "Não foi possível renomear o arquivo \"{0}\"."
+
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
 msgid "PicLayer"
@@ -15684,5 +15842,5 @@
 #, java-format
 msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr ""
+msgstr "Remover nó ''{0}'' na posição {1} da relação ''{2}''"
 
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RemoveRelationMemberCommand.java:71
@@ -15861,6 +16019,6 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -15982,72 +16140,133 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+msgid "Terrace a house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+msgid "Interpolation"
+msgstr "Interpolação"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr "Segmentos"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Ruas"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Número mais alto"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Número mais baixo"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+#, fuzzy
+msgid "Lowest housenumber of the terraced house"
+msgstr ""
+"O número mais baixo de endereço não pode ser maior que o número mais alto de "
+"endereço."
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Criar uma nova relação"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Apagar vias duplicadas"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Nome do rua"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+msgstr "Par/Ímpar"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+msgstr "Número mais baixo"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+msgstr "Número mais alto"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+"O número mais baixo de endereço não pode ser maior que o número mais alto de "
+"endereço."
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+msgstr "{0} deve ser maior que 0"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+msgstr "{0} não é um número"
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:83
+#, fuzzy
+msgid "Cannot reverse!"
+msgstr "não presente"
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:125
 msgid "Reverse Terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+msgstr "Criar edifícios individuais a partir de um edifício comprido."
+
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+msgstr "Selecione uma via simples e fechada de ao menos quatro nós."
+
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr ""
@@ -16058,13 +16277,13 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:82
 msgid "Validation errors"
-msgstr ""
+msgstr "Erros de validação"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:91
 msgid "No validation errors"
-msgstr ""
+msgstr "Sem erros de validação"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:168
 msgid "Grid"
-msgstr ""
+msgstr "Grade"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:276
@@ -16077,17 +16296,17 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:73
 msgid "Use ignore list."
-msgstr ""
+msgstr "Usar lista de ignorados."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:74
 msgid "Use the ignore list to suppress warnings."
-msgstr ""
+msgstr "Usar lista de ignorados para suprimir avisos."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:77
 msgid "Use error layer."
-msgstr ""
+msgstr "Usar camada de erros."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:78
 msgid "Use the error layer to display problematic elements."
-msgstr ""
+msgstr "Usar camada de erros para mostrar elementos problemáticos."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
@@ -16105,5 +16324,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:88
 msgid "On upload"
-msgstr ""
+msgstr "Ao enviar"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:99
@@ -16115,5 +16334,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
 msgid "Data validator"
-msgstr ""
+msgstr "Validador de dados"
 
 #. * Error messages
@@ -16124,5 +16343,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:13
 msgid "validation error"
-msgstr ""
+msgstr "erro de validação"
 
 #. * Warning messages
@@ -16133,5 +16352,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:15
 msgid "validation warning"
-msgstr ""
+msgstr "aviso de validação"
 
 #. * Other messages
@@ -16147,5 +16366,5 @@
 #, java-format
 msgid "Running test {0}"
-msgstr ""
+msgstr "Executando teste {0}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:44
@@ -16156,30 +16375,30 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:44
 msgid "Performs the data validation"
-msgstr ""
+msgstr "Executar validação de dados"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:120
 msgid "Validating"
-msgstr ""
+msgstr "Validando"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:161
 #, java-format
 msgid "Test {0}/{1}: Starting {2}"
-msgstr ""
+msgstr "Teste {0}/{1}: Iniciando {2}"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:170
 msgid "Updating ignored errors ..."
-msgstr ""
+msgstr "Atualizando erros ignorados ..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateUploadHook.java:117
 msgid "Data with errors. Upload anyway?"
-msgstr ""
+msgstr "Dados com erros. Enviar assim mesmo?"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:81
 msgid "Open the validation window."
-msgstr ""
+msgstr "Abrir a janela de validação."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:88
 msgid "Zoom to problem"
-msgstr ""
+msgstr "Zoom no problema"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
@@ -16189,13 +16408,13 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:109
 msgid "Fix the selected errors."
-msgstr ""
+msgstr "Consertar erros selecionados."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:114
 msgid "Ignore the selected errors next time."
-msgstr ""
+msgstr "Ignorar erros selecionados na próxima vez."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:195
 msgid "Whole group"
-msgstr ""
+msgstr "Todo o grupo"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:195
@@ -16213,23 +16432,23 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:197
 msgid "Ignoring elements"
-msgstr ""
+msgstr "Ignorando elementos"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:458
 msgid "Fixing errors ..."
-msgstr ""
+msgstr "Consertando erros ..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:482
 #, java-format
 msgid "Fixing ({0}/{1}): ''{2}''"
-msgstr ""
+msgstr "Consertando ({0}/{1}): ''{2}''"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:499
 msgid "Updating map ..."
-msgstr ""
+msgstr "Atualizando mapa ..."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:69
 #, java-format
 msgid "Replace \"{0}\" by \"{1}\" for"
-msgstr ""
+msgstr "Substituir \"{0}\" por \"{1}\" para"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/ChangePropertyKeyCommand.java:75
@@ -16242,21 +16461,21 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:41
 msgid "Coastlines."
-msgstr ""
+msgstr "Linhas costeiras."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:42
 msgid "This test checks that coastlines are correct."
-msgstr ""
+msgstr "Este teste verifica se linhas costeiras estão corretas."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:120
 msgid "Unconnected coastline"
-msgstr ""
+msgstr "Linha costeira não conectada"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:150
 msgid "Unordered coastline"
-msgstr ""
+msgstr "Linha costeira não ordenada"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/Coastlines.java:154
 msgid "Reversed coastline"
-msgstr ""
+msgstr "Linha costeira invertida"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
@@ -16281,13 +16500,13 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
-msgstr ""
+msgstr "Nós duplicados"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:53
 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:144
+msgstr "Este teste verifica se não há nós na mesma posição."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16299,16 +16518,16 @@
 "<br>Realmente quer apagar?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr "Confirmação"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
-msgstr ""
+msgstr "Nós na mesma posição"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:59
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:79
 msgid "Duplicated ways"
-msgstr ""
+msgstr "Vias duplicadas"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:60
@@ -16317,24 +16536,26 @@
 "coordinates."
 msgstr ""
+"Este teste verifica se não há vias com as mesmas etiquetas e mesmas "
+"coordenadas de nós."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:144
 msgid "Delete duplicate ways"
-msgstr ""
+msgstr "Apagar vias duplicadas"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:22
 msgid "Duplicated way nodes."
-msgstr ""
+msgstr "Apagar nós de via duplicados."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23
 msgid "Checks for ways with identical consecutive nodes."
-msgstr ""
+msgstr "Verificar vias para nós consecutivos idênticos."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36
 msgid "Duplicated way nodes"
-msgstr ""
+msgstr "Nós de via duplicados"
 
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr "Multipolígono"
@@ -16342,5 +16563,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:26
 msgid "This test checks if multipolygons are valid"
-msgstr ""
+msgstr "Este teste checa se multipolígonos são válidos"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:38
@@ -16479,7 +16700,7 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -16487,80 +16708,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16568,86 +16789,86 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "Origens de dados"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -17088,5 +17309,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -17097,63 +17318,63 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+msgid "Download visible tiles"
+msgstr "Baixar tiles visíveis"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
-msgid "Download visible tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+msgstr "Mudar resolução"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+msgstr "Canal alfa"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+msgstr "Salvar camada WMS para arquivo"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+msgstr "Salvar camada WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+msgstr "Carregar camada WMS de um arquivo"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+msgstr "Carregar camada WMS"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+msgstr "Erro no formato do arquivo"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "Erro ao carregar arquivo"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -17161,5 +17382,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:174
 msgid "WMS"
-msgstr ""
+msgstr "WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:187
@@ -17169,5 +17390,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
 msgid "WMS Plugin Preferences"
-msgstr ""
+msgstr "Preferências do plugin WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:43
@@ -17178,10 +17399,10 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:78
 msgid "Menu Name"
-msgstr ""
+msgstr "Nome do Menu"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:45
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:82
 msgid "WMS URL"
-msgstr ""
+msgstr "URL do WMS"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:57
@@ -17404,6 +17625,13 @@
 msgstr ""
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17412,15 +17640,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17429,10 +17657,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17441,15 +17669,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17459,10 +17687,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17471,5 +17699,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17478,10 +17706,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -17588,6 +17816,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -17595,6 +17832,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "Referência"
@@ -17611,5 +17849,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Faixas"
@@ -17631,10 +17869,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Velocidade máxima (km/h)"
@@ -17678,14 +17916,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "Mão Única"
@@ -17728,13 +17966,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -17772,13 +18010,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Túnel"
@@ -17813,13 +18051,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "Corte"
@@ -17854,13 +18092,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr ""
@@ -17991,4 +18229,13 @@
 #: build/trans_presets.java:225
 msgid "Edit Unclassified Road"
+msgstr ""
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
 msgstr ""
 
@@ -18007,15 +18254,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr "Largura (metros)"
@@ -18027,5 +18274,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Residencial"
@@ -18034,5 +18281,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "Editar Rua Residencial"
@@ -18050,16 +18297,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Superfície"
@@ -18081,166 +18331,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr "pavimentada"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr "não pavimentada"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr "concreto"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "madeira"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "pedras"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "grama"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "areia"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr "terra"
@@ -18248,5 +18505,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr ""
@@ -18255,5 +18512,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr ""
@@ -18261,5 +18518,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr ""
@@ -18268,5 +18525,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "Editar Calçadão"
@@ -18274,5 +18531,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr "Serviço"
@@ -18281,5 +18538,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr "Editar Rua de Serviço"
@@ -18289,18 +18546,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr "Tipo de Rua de Serviço"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr ""
@@ -18308,5 +18565,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr ""
@@ -18316,5 +18573,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -18322,5 +18579,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -18329,5 +18586,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -18336,20 +18593,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "Pedágio"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "Sem saída"
@@ -18357,9 +18614,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 msgid "Access"
 msgstr "Acesso"
 
 #. 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"
@@ -18370,6 +18628,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18381,4 +18637,5 @@
 #. 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"
@@ -18397,141 +18654,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+msgid "yes"
+msgstr "sim"
+
+#. 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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "privado"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr "permitido"
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-msgid "yes"
-msgstr "sim"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "privado"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr ""
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr "permitido"
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "não"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr "Carga"
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Veículos de Carga Pesados"
@@ -18546,10 +18811,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr "Cavalo"
@@ -18565,10 +18830,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "Motocicleta"
@@ -18583,27 +18848,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr "Automóvel"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr "Veículos de Serviço Público"
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr "Barco motorizado"
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "Barco"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Velocidade mínima (km/h)"
@@ -18611,25 +18868,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "Peso máximo (toneladas)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr "Altura máxima (metros)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr "Largura máx. (metros)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr "Comprimento Máx. (metros)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "Rotatória"
@@ -18640,5 +18897,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "Editar Junção"
@@ -18658,10 +18915,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr ""
@@ -18683,10 +18940,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr ""
@@ -18708,10 +18965,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr ""
@@ -18733,5 +18990,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -18746,9 +19003,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr ""
@@ -18762,9 +19019,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr ""
@@ -18794,10 +19051,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "serviço"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr ""
@@ -18827,5 +19084,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -18837,10 +19094,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Editar Ponte"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr "Editar Túnel"
@@ -18848,19 +19105,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Vias"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "Construção"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "Editar Rodovia em Construção"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "Junção"
@@ -18876,5 +19133,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "rotatória"
@@ -18882,5 +19139,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr "Trilha"
@@ -18889,40 +19146,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr "Editar Trilha"
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "Trilha"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "pedras"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "pedras"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "pedras"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "pedras"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "pedras"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr ""
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -18930,5 +19181,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -18936,28 +19187,26 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr "caminhada"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "Chafariz"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
-msgstr "caminhada"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
 msgstr ""
@@ -18965,5 +19214,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "Caminho"
@@ -18972,7 +19221,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "Edicar Caminho"
+
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
 
 #: build/trans_presets.java:489
@@ -18992,7 +19262,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "Editar Ponte"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -19005,7 +19274,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "Editar Ciclovia"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -19040,24 +19308,21 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "Combinar assim mesmo"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "Editar Calçada"
+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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Editar Calçada"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr ""
@@ -19065,5 +19330,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "Escada"
@@ -19073,5 +19338,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Editar Escadaria"
@@ -19079,10 +19344,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr ""
@@ -19090,15 +19355,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "Número"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "Serviços"
@@ -19106,5 +19371,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr ""
@@ -19112,5 +19377,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -19143,17 +19409,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "Operador"
@@ -19162,5 +19428,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "Sinal de Trânsito"
@@ -19170,5 +19436,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr "Tipo de cruzamento de pedestres"
@@ -19177,27 +19443,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr "faixa de pedestre (sem sinal)"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr "sinal de trânsito"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "ilha"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr "sem faixa"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr "Travessia à cavalo"
@@ -19205,6 +19471,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr "Travessia de bicicleta"
@@ -19213,11 +19479,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr "Guarda de trânsito"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -19225,30 +19491,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
-msgstr ""
-
-#: build/trans_presets.java:650 build/trans_presets.java:665
+msgstr "zebra"
+
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
-msgstr ""
-
-#: build/trans_presets.java:650 build/trans_presets.java:665
+msgstr "pelicano"
+
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
-msgstr ""
-
-#: build/trans_presets.java:650 build/trans_presets.java:665
+msgstr "tucano"
+
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
-msgstr ""
-
-#: build/trans_presets.java:650 build/trans_presets.java:665
+msgstr "papagaio"
+
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
-msgstr ""
-
-#: build/trans_presets.java:650 build/trans_presets.java:665
+msgstr "pégasus"
+
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
-msgstr ""
+msgstr "tigre"
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "Pare"
@@ -19256,5 +19522,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr "Faixa de Pedestres"
@@ -19263,14 +19529,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr "Editar Faixa de Pedestres"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr "Mini-rotatória"
@@ -19281,14 +19593,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr "Direção"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr "sentido horário"
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr ""
@@ -19298,26 +19610,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "Limite da Cidade"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "Editar Placa de Limite da Cidade"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 msgid "Speed Camera"
 msgstr "Radar de Velocidade"
 
 #. 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "Telefone de Emergência"
@@ -19325,5 +19639,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr "Aclive"
@@ -19331,5 +19645,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr ""
@@ -19337,11 +19651,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
-msgstr ""
+msgstr "Ford"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr ""
@@ -19349,5 +19670,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr ""
@@ -19355,5 +19676,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -19365,7 +19686,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "Altitude"
@@ -19373,5 +19694,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Barreiras"
@@ -19379,5 +19700,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr ""
@@ -19385,5 +19706,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr ""
@@ -19428,16 +19749,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr ""
@@ -19446,5 +19767,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr ""
@@ -19452,5 +19773,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr ""
@@ -19458,10 +19779,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr ""
@@ -19469,15 +19790,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr ""
@@ -19485,5 +19806,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr ""
@@ -19491,10 +19812,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr ""
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr ""
@@ -19504,5 +19825,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr ""
@@ -19511,12 +19832,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
-msgid "Fence"
-msgstr ""
-
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#: build/trans_presets.java:817 build/trans_presets.java:819
+msgid "Fence"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr ""
@@ -19524,5 +19857,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr ""
@@ -19531,5 +19864,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr ""
@@ -19541,15 +19874,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr "Entrada"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr "Editar Entrada"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr ""
@@ -19557,50 +19891,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr ""
@@ -19608,25 +19942,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr ""
@@ -19637,11 +19971,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "Água"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr ""
@@ -19649,5 +19983,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr ""
@@ -19655,5 +19989,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr ""
@@ -19661,10 +19995,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr ""
@@ -19672,10 +20017,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr ""
@@ -19683,10 +20028,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr ""
@@ -19696,5 +20041,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr ""
@@ -19702,15 +20047,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Editar Água"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr ""
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr ""
@@ -19718,15 +20063,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr ""
@@ -19734,15 +20079,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -19750,5 +20095,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr ""
@@ -19757,10 +20102,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr ""
@@ -19771,14 +20116,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr ""
@@ -19792,35 +20137,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr ""
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr ""
@@ -19828,20 +20173,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr ""
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr ""
@@ -19849,10 +20194,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr ""
@@ -19860,5 +20205,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr ""
@@ -19866,5 +20211,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr ""
@@ -19872,5 +20217,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr ""
@@ -19879,5 +20224,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr ""
@@ -19885,10 +20230,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr ""
@@ -19896,5 +20241,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr ""
@@ -19902,5 +20247,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr ""
@@ -19908,15 +20253,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr ""
@@ -19925,5 +20270,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr ""
@@ -19931,20 +20276,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "Editar Queda-d'água"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr ""
@@ -19953,15 +20298,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr ""
@@ -19969,10 +20314,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr ""
@@ -19980,10 +20325,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr ""
@@ -19993,20 +20338,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr "Transporte"
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr ""
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr ""
@@ -20014,5 +20359,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr ""
@@ -20021,139 +20366,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr ""
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr ""
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr "trilho"
+
+#. 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:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+msgid "Voltage"
+msgstr "Voltagem"
+
+#. 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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr ""
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr ""
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr ""
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr ""
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr ""
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "Bonde/VLT"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr "Editar Bonde/VLT"
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr ""
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr ""
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr ""
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr ""
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr ""
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr ""
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr ""
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr ""
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr ""
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr ""
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr ""
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr ""
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr ""
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr ""
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "Bonde/VLT"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr "Editar Bonde/VLT"
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr ""
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr ""
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr ""
@@ -20162,5 +20746,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr ""
@@ -20169,5 +20753,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr ""
@@ -20177,5 +20761,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr ""
@@ -20183,5 +20767,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr ""
@@ -20190,10 +20774,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr ""
@@ -20201,10 +20792,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr ""
@@ -20212,10 +20803,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr ""
@@ -20223,10 +20814,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr ""
@@ -20234,10 +20825,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20245,12 +20836,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr ""
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "Posto de Gasolina"
@@ -20260,9 +20864,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Editar Posto de Gasolina"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20316,32 +20977,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "Horário de Funcionamento"
@@ -20400,94 +21061,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20499,5 +21236,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20507,5 +21244,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Editar Estacionamento"
@@ -20516,25 +21253,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr "Número de Referência"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr ""
@@ -20543,48 +21280,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "Taxa"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "Lava Jato"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "Editar Lava Jato"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "Oficina"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "Editar Oficina"
@@ -20592,5 +21329,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "Aluguel"
@@ -20599,10 +21336,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "Editar Aluguel de Carros"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr "Compartilhamento"
@@ -20610,5 +21347,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr "Editar Compartilhamento de Carro"
@@ -20616,10 +21353,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "Editar Bicicletário"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr ""
@@ -20628,15 +21365,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "Editar Aluguel de Bicicletas"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Transporte Público"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -20646,5 +21383,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -20652,5 +21389,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr ""
@@ -20658,5 +21395,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr ""
@@ -20664,5 +21401,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr ""
@@ -20670,5 +21407,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "Parada do Bonde/VLT"
@@ -20677,5 +21414,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "Editar Parada do Bonde/VLT"
@@ -20683,5 +21420,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "Plataforma de Trens"
@@ -20690,5 +21427,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "Editar Plataforma de Trens"
@@ -20700,5 +21437,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr ""
@@ -20706,10 +21443,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "Entrada do Metrô"
@@ -20718,10 +21455,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "Editar Entrada do Metrô"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr ""
@@ -20730,5 +21467,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "Terminal de Ônibus"
@@ -20737,5 +21474,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "Editar Terminal de Ônibus"
@@ -20743,5 +21480,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "Ponto de Ônibus"
@@ -20751,5 +21488,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "Editar Ponto de Ônibus"
@@ -20758,25 +21495,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr "Abrigo"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "Banco"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr "Plataforma de Ônibus"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr "Editar Plataforma de Ônibus"
@@ -20784,5 +21522,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "Táxi"
@@ -20790,5 +21528,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "Editar Ponto de Táxi"
@@ -20796,32 +21534,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "Aeroporto"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr "Editar Aeroporto"
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr ""
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr ""
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr "Viagem"
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Acomodação"
@@ -20833,5 +21666,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -20840,15 +21673,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr ""
@@ -20856,20 +21689,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "Chalé"
@@ -20877,10 +21710,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr "Editar Chalé"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr "Albergue"
@@ -20888,30 +21721,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr "Editar Albergue"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr ""
@@ -20919,10 +21752,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Comida e Bebida"
@@ -20933,5 +21766,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurante"
@@ -20939,5 +21772,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "Editar Restaurante"
@@ -20945,5 +21778,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr "Cozinha"
@@ -20951,61 +21784,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "italiana"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "chinessa"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "hambúrguer"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "grega"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "alemã"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "indiana"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "turca"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "asiática"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "tailandesa"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "mexicana"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "japonesa"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "Lanchonete"
@@ -21013,9 +21858,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "Editar Lanchonete Fast-Food"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "Café"
@@ -21023,9 +21876,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "Editar Café"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "Bar/Pub"
@@ -21033,18 +21886,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "Editar Bar/Pub"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr ""
@@ -21052,9 +21905,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "Boate"
@@ -21062,24 +21915,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "Editar Boate"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr "Atração"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr "Editar Atração Turística"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Museu"
@@ -21087,9 +21940,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Editar Museu"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Zoológico"
@@ -21098,9 +21951,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Editar Zoológico"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "Mirante"
@@ -21108,24 +21961,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "Editar Mirante"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "Parque Temático"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr "Editar Parque Temático"
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "Arte"
@@ -21133,5 +21986,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "Editar Arte"
@@ -21139,19 +21992,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr "Centro de Informações Turísticas"
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr ""
@@ -21189,5 +22042,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -21195,28 +22048,28 @@
 msgstr "estrada"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr ""
@@ -21226,5 +22079,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr ""
@@ -21232,5 +22085,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr ""
@@ -21238,6 +22091,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr ""
@@ -21245,5 +22098,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr ""
@@ -21251,6 +22104,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr ""
@@ -21258,5 +22111,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr ""
@@ -21264,46 +22117,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr "... outros modos de transporte possíveis"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr "Quadro de Informações"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "história"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr "natureza"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr "vida selvagem"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr ""
@@ -21311,29 +22164,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr "Outros Pontos de Informação"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr "Editar Abrigo"
@@ -21341,25 +22194,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr "Lareira"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "Campo de Picnic"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "Editar Campo de Picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Lugares Históricos"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Castelo"
@@ -21368,19 +22221,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Editar Castelo"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Ruínas"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Editar Ruínas"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Sítio Arqueológico"
@@ -21389,9 +22242,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "Editar Sítio Arqueológico"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "Campo de Batalha"
@@ -21399,10 +22252,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "Editar Campo de Batalha"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr ""
@@ -21410,5 +22263,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -21416,15 +22269,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "Editar Monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "Memorial"
@@ -21432,55 +22285,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "Editar Memorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr "Cruz de beira de estrada"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr "Editar Cruz de beira de estrada"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Lazer"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "Parque Aquático"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "Editar Parque Aquático"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Parquinho"
@@ -21488,35 +22341,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Editar Parquinho"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Pescaria"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "Editar Pescaria"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr "Esportes"
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Estádio"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Editar Estádio"
@@ -21530,6 +22383,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "selecionar esporte:"
@@ -21921,6 +22774,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -21954,225 +22807,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "arco e flecha"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr "atletismo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "futebol australiano"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "basquete"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr "boliche"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr "canoagem"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "escalada"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr "críquete"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr "corrida de cachorros"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "futebol americano"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "golfe"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "ginástica olímpica"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "hóquei"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr "corrida de cavalos"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr "automobilismo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "esqui"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "futebol"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "natação"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "ping-pong"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "tênis"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "Centro de Esportes"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "Editar Centro de Esportes"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "Mini-Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "Editar Mini-Golf"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr ""
@@ -22211,21 +23064,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "tipo"
@@ -22264,203 +23117,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "estádio"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr ""
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr ""
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr ""
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr ""
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr ""
@@ -22468,56 +23321,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
-msgstr ""
+msgstr "Dificuldade"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr ""
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr ""
@@ -22525,188 +23374,188 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr ""
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr ""
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr "Editar Campo de Baseball"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr ""
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
-msgstr ""
+msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
-msgstr ""
+msgstr "Editar Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
-msgstr ""
+msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
-msgstr ""
-
-#: build/trans_presets.java:1976
+msgstr "Editar Hockey"
+
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
-msgstr ""
+msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
-msgstr ""
-
-#: build/trans_presets.java:1994
+msgstr "Editar Rugby"
+
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr ""
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
-msgstr ""
+msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Construções"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
-msgstr ""
+msgstr "Edificação"
 
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Prédio Público"
@@ -22714,10 +23563,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Editar Prédio Público"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "Prefeitura"
@@ -22725,10 +23574,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Editar Prefeitura"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Embaixada"
@@ -22736,10 +23585,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Editar Embaixada"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "Fórum"
@@ -22748,10 +23597,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Editar Fórum"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Presídio"
@@ -22760,10 +23609,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Editar Presídio"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Polícia"
@@ -22773,10 +23622,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Editar Polícia"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "Bombeiros"
@@ -22785,10 +23634,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Editar Bombeiros"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Correios"
@@ -22796,5 +23645,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Editar Correios"
@@ -22802,15 +23651,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "Creche"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "Editar Creche"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "Escola"
@@ -22818,10 +23667,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "Editar Escola"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "Universidade"
@@ -22829,10 +23678,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "Editar Universidade"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "Faculdade"
@@ -22840,5 +23689,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "Editar Faculdade"
@@ -22846,5 +23695,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Cinema"
@@ -22853,10 +23702,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Editar Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "Biblioteca"
@@ -22865,9 +23714,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Editar Biblioteca"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "Centro de Artes"
@@ -22875,10 +23724,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "Editar Centro de Artes"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Teatro"
@@ -22887,10 +23736,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Editar Teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "Lugar de Adoração"
@@ -22900,5 +23749,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "Editar Lugar de Adoração"
@@ -22907,74 +23756,74 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
-msgstr ""
+msgstr "Religião"
 
 #. 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:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "budismo"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "cristianismo"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "hinduísmo"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr "jainismo"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "judaísmo"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "muçulmano"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr "sikhismo"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr "espiritismo"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr "taoísmo"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr "unitarianismo"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr "zoroastrianismo"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr "Denominação"
@@ -22983,81 +23832,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr "anglicana"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "batista"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "católica"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr "evangélica"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr "testemunha de jeová"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "luterana"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr "mórmon"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "ortodoxa"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr "presbiteriana"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr "xiismo"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr "sunismo"
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Endereços"
@@ -23066,5 +23915,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Editar Informações de Endereço"
@@ -23072,5 +23921,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "Número da casa"
@@ -23078,25 +23927,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "Nome da casa"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Nome do rua"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "Cidade"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "CEP"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "Código do país"
@@ -23105,5 +23954,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "Editar Interpolação de Endereços"
@@ -23111,87 +23960,87 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr "Esquema de numeração"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "números ímpares"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "números pares"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr "alfabético"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "Fábrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "Editar Fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Editar Torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
-msgstr ""
-
-#: build/trans_presets.java:2164
+msgstr "comunicação"
+
+#: build/trans_presets.java:2319
 msgid "observation"
-msgstr ""
+msgstr "observação"
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
-msgstr ""
+msgstr "Altura (metros)"
 
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Torre de Água"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Editar Torre de Água"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "Gasômetro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "Editar Gasômetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "Farol"
@@ -23199,10 +24048,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Editar Farol"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Moinho de Vento"
@@ -23210,10 +24059,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Editar Moinho de Vento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Cano"
@@ -23222,37 +24071,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Editar Cano"
 
-#: build/trans_presets.java:2198
-msgid "oil"
-msgstr ""
-
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
 msgid "gas"
 msgstr "gás"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr ""
+
+#: build/trans_presets.java:2353
+msgid "oil"
+msgstr "petróleo"
+
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr "subaquático"
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "Estação de Tratamento de Esgoto"
@@ -23262,10 +24111,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "Editar Estação de Tratamento de Esgoto"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Guindaste"
@@ -23273,21 +24122,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Editar Guindaste"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr ""
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "Vértice Geodésico"
@@ -23295,10 +24139,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "Editar Vértice Geodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "Câmera de Vigilância"
@@ -23306,11 +24150,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Editar Câmera de Vigilância"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "Gerador de Energia"
@@ -23320,35 +24176,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "Editar Gerador de Energia"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "eólica"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "hidrelétrica"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "fóssil"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
-msgstr ""
-
-#: build/trans_presets.java:2240
+msgstr "carvão"
+
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr "carvão"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "Estação de Energia"
@@ -23357,10 +24213,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "Editar Estação de Energia"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "Subestação de Energia"
@@ -23369,5 +24225,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "Editar Subestação de Energia"
@@ -23375,10 +24231,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "Torre de Energia"
@@ -23389,23 +24245,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "Editar Torre de Energia"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "Linha de transmissão"
@@ -23414,79 +24270,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "Editar Linha de Transmissão"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr ""
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "Voltagem"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr "Comodidades"
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Banheiros"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "Caixa de Correio"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Telefone"
@@ -23495,5 +24346,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Editar Telefone"
@@ -23501,5 +24352,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Moedas"
@@ -23507,5 +24358,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "Notas"
@@ -23513,5 +24364,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -23519,5 +24370,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr ""
@@ -23525,15 +24376,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Cartão de Crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Cartão Telefônico"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Reciclagem"
@@ -23542,5 +24393,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr ""
@@ -23548,65 +24399,76 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "Baterias"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "Latas"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "Roupas"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "Vidro"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "Ferro Velho"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+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:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
-msgstr ""
-
-#: build/trans_presets.java:2326
+msgstr "rocha"
+
+#: build/trans_presets.java:2488
 msgid "plastic"
-msgstr ""
-
-#: build/trans_presets.java:2327
+msgstr "plástico"
+
+#: build/trans_presets.java:2489
 msgid "Colour"
-msgstr ""
+msgstr "Cor"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
-msgstr ""
-
-#: build/trans_presets.java:2327
+msgstr "preto"
+
+#: build/trans_presets.java:2489
 msgid "brown"
-msgstr ""
+msgstr "marrom"
 
 #. color historic
@@ -23683,5 +24545,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -23689,33 +24551,33 @@
 #: build/trans_style.java:3342 build/trans_style.java:3350
 msgid "green"
-msgstr ""
-
-#: build/trans_presets.java:2327
+msgstr "verde"
+
+#: build/trans_presets.java:2489
 msgid "red"
-msgstr ""
-
-#: build/trans_presets.java:2327
+msgstr "vermelho"
+
+#: build/trans_presets.java:2489
 msgid "blue"
-msgstr ""
-
-#: build/trans_presets.java:2327
+msgstr "azul"
+
+#: build/trans_presets.java:2489
 msgid "gray"
-msgstr ""
-
-#: build/trans_presets.java:2327
+msgstr "cinza"
+
+#: build/trans_presets.java:2489
 msgid "white"
-msgstr ""
-
-#: build/trans_presets.java:2328
+msgstr "branco"
+
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
-msgstr ""
+msgstr "Número de Assentos"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -23724,30 +24586,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "Altura"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr "baixa"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
-msgstr ""
-
-#: build/trans_presets.java:2333
+msgstr "metade"
+
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "Chafariz"
@@ -23756,10 +24618,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "Editar Chafariz"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "Bebedouro"
@@ -23768,10 +24630,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Editar Bebedouro"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr ""
@@ -23779,15 +24654,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Lojas"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr ""
@@ -23795,10 +24670,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "Editar Loja de Carros"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr ""
@@ -23807,28 +24682,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "Editar Loja de Bicicletas"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "Supermercado"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "Editar Supermercado"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr "Loja de Conveniência"
@@ -23836,9 +24711,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr "Editar Loja de Conveniência"
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "Quiosque"
@@ -23846,27 +24721,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "Editar Quiosque"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
-msgstr ""
+msgstr "Livraria"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
-msgstr ""
-
-#: build/trans_presets.java:2407
+msgstr "Editar Livraria"
+
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr "Agência de Viagem"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr "Editar Agência de Viagem"
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr ""
@@ -23874,5 +24749,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "Editar Máquina de Vendas"
@@ -23880,88 +24755,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "Produtos à venda"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr "tíquetes de transporte público"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr "mapas de transporte público"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr "tíquetes de estacionamento"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "comida"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "bebidas"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "doces"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "cigarros"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "fotos"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "ração animal"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "jornais"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "brinquedos"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "selos"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "Cartões SIM"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "preservativos"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr "absorventes"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr "sacos para fezes"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr "Cartões de fidelidade"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "Açougue"
@@ -23969,9 +24844,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Editar Açougue"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "Padaria"
@@ -23979,9 +24854,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Editar Padaria"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "Floricultura"
@@ -23989,18 +24864,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "Editar Floricultura"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr "Orgânicos"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr "Editar Loja de Orgânicos"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr "Álcool"
@@ -24008,54 +24883,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr "Bebidas"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr "Editar Loja de Bebidas"
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr "Computador"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "Editar Loja de Computador"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr "Eletrônicos"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "Editar Loja de Eletrônicos"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr "Equipamentos de Áudio"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr "Editar Loja de Equipamentos de Áudio"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr "Móveis"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "Editar Loja de Móveis"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr "Loja de Plantas"
@@ -24063,9 +24938,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr "Editar Loja de Plantas"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr ""
@@ -24073,9 +24948,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr "Editar Loja de Utilidades Domésticas"
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -24083,54 +24958,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr "Papelaria"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr "Editar Papelaria"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "Cabelereiro"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "Editar Cabelereiro"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr "Sapatos"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "Editar Loja de Sapatos"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr "Brinquedos"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "Editar Loja de Brinquedos"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr "Locadora de Vídeo"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr "Editar Locadora de Vídeo"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Lavanderia à Seco"
@@ -24138,9 +25013,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Editar Lavanderia à Seco"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Lavanderia"
@@ -24148,9 +25023,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Editar Lavanderia"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr ""
@@ -24158,28 +25033,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr "Editar Loja de Esportes"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr "Óculos"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "Editar Loja de Óculos"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Dinheiro"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Banco"
@@ -24187,14 +25062,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Editar Banco"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "Caixa Eletrônico"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Loja de Câmbio"
@@ -24202,5 +25077,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Editar Loja de Câmbio"
@@ -24208,15 +25083,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Editar Caixa Eletrônico"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Saúde"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "Médicos"
@@ -24224,18 +25099,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "Editar Médicos"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "Dentistas"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "Editar Dentistas"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Farmácia"
@@ -24243,5 +25118,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Editar Farmácia"
@@ -24249,9 +25124,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Hospital"
@@ -24259,10 +25134,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Editar Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr "Entrada de Emergência"
@@ -24271,5 +25146,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr "Editar Entrada de Emergência"
@@ -24278,20 +25153,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
-msgstr ""
+msgstr "Número do Ponto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "Número de telefone"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Use código internacional, como +12-345-67890)"
@@ -24299,5 +25174,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "Veterinária"
@@ -24306,64 +25181,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "Editar Veterinária"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr "Geografia"
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Lugares"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Continente"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Editar Continente"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "País"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Editar País"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "Estado"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "Editar Estado"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "Região"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "Editar Região"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr "Condado"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr "Editar Condado"
@@ -24371,15 +25246,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "Cidade"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "Editar Cidade (mais que 100 mil habitantes)"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "Cidade (menos que 100 mil habitantes)"
@@ -24387,10 +25262,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "Editar Cidade (menos que 100 mil habitantes)"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "Bairro"
@@ -24398,25 +25273,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "Editar Bairro"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Vilarejo"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Editar Vilarejo"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr ""
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr ""
@@ -24424,5 +25299,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr ""
@@ -24430,10 +25305,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "Ilha"
@@ -24441,10 +25316,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Editar Ilha"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr ""
@@ -24452,5 +25327,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr ""
@@ -24458,5 +25333,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "Entrada de Caverna"
@@ -24464,10 +25339,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "Editar Entrada de Caverna"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Pico"
@@ -24475,10 +25350,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Editar Pico"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "Geleira"
@@ -24486,10 +25361,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "Editar Geleira"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "Vulcão"
@@ -24497,70 +25372,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "Editar Vulcão"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Fronteiras"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "Nacional"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "Editar Fronteiras Nacionais"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "Administrativo"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "Editar Fronteiras Administrativas"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr "Editar Fronteiras Civis"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr "Político"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "Editar Fronteiras Políticas"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr "Parque nacional"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "Editar Fronteira de Parque Nacional"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Uso da terra"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Árvore"
@@ -24569,15 +25444,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Editar Árvore"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "Nome Botânico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "Floresta"
@@ -24586,5 +25461,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "Editar Floresta"
@@ -24592,17 +25467,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "conífera"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "decídua"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "misturado"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "Floresta"
@@ -24611,14 +25486,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "Reserva Natural"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "Editar Reserva Natural"
@@ -24626,25 +25501,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr "Arbusto"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr "Editar arbusto"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr ""
@@ -24652,10 +25527,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr "Editar rocha"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr "Matagal"
@@ -24663,5 +25538,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "Editar matagal"
@@ -24669,5 +25544,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr ""
@@ -24676,45 +25551,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr ""
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -24722,25 +25597,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "Jardim"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "Editar Jardim"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr ""
@@ -24748,10 +25623,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr ""
@@ -24759,20 +25634,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "Parque"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "Editar Parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr "área de recreação"
@@ -24780,5 +25655,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -24786,15 +25661,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "Cemitério"
@@ -24802,9 +25677,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Editar Cemitério"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "Cemitério"
@@ -24812,39 +25687,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "Comercial"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr ""
@@ -24852,15 +25727,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "Militar"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr ""
@@ -24868,50 +25743,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "Área de construção"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "Pedreira"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr ""
@@ -24921,5 +25796,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr "Editar Multipolígono"
@@ -24928,10 +25803,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr "segmento externo"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr "segmento interno"
@@ -24939,5 +25814,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr "Restrição de manobra"
@@ -24946,5 +25821,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr "Editar restrição de manobras"
@@ -24952,34 +25827,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr "Restrição"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr "proibida_conversão_esquerda"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr "proibida_conversão_direita"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr "proibido_em_frente"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr "proibido_retornar"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr "somente_a_direita"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr "somente_a_esquerda"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr "somente_em_frente"
@@ -24988,15 +25863,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr "do caminho"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr "nó de via ou caminho"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr "para caminho"
@@ -25004,18 +25879,18 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
-msgstr ""
+msgstr "Rota"
 
 #. 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:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
-msgstr ""
+msgstr "Editar Rota"
 
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr "Tipo de rota"
@@ -25106,5 +25981,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -25112,19 +25987,19 @@
 #: build/trans_style.java:933 build/trans_style.java:941
 msgid "bicycle"
-msgstr ""
-
-#: build/trans_presets.java:3051
+msgstr "bicicleta"
+
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr "ônibus"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr "estrada"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr "Ferry"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr "Esqui"
@@ -25184,16 +26059,16 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
 #: build/trans_style.java:740 build/trans_style.java:748
 msgid "foot"
-msgstr ""
-
-#: build/trans_presets.java:3051
+msgstr "a pé"
+
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr "bonde/VLT"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr "desvio"
@@ -25207,10 +26082,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "Metrô"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr "Descrição de símbolo"
@@ -25218,31 +26093,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
-msgstr ""
+msgstr "Rede"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr "Proposto"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr "alternativa"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr "temporário"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr "Cor (hex)"
@@ -25251,107 +26126,32 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr "segmento de rota"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr "segmento em frente"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr "Ponto de parada"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr "ponto de parada em frente"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 msgid "backward halt point"
 msgstr "ponto de parada atrás"
-
-#. <!--
-#. 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"
@@ -25887,77 +26687,4 @@
 msgid "highway_track"
 msgstr "trilha_autoestrada"
-
-#. 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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
-msgstr "trilho"
 
 #. color rail
@@ -26345,7 +27072,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "batista"
+msgstr ""
 
 #. color manmade
@@ -29200,5 +29926,5 @@
 #: build/trans_surveyor.java:60
 msgid "Camping"
-msgstr ""
+msgstr "camping"
 
 #. <button label="Residential" hotkey="5">
@@ -29377,5 +30103,5 @@
 #: build/trans_wms.java:10
 msgid "Yahoo Sat"
-msgstr ""
+msgstr "Yahoo Sat"
 
 #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
@@ -29392,5 +30118,5 @@
 #: build/trans_wms.java:13
 msgid "TilesAtHome"
-msgstr ""
+msgstr "TilesAtHome"
 
 #. html:http://josm.openstreetmap.de/wmsplugin/TilesAtHome.html?
@@ -29454,20 +30180,20 @@
 #: build/trans_wms.java:39
 msgid "MLIT Japan (ORTHO)"
-msgstr ""
+msgstr "MLIT Japão (ORTHO)"
 
 #. 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 ""
+msgstr "MLIT Japão (ORTHO01)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO01&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
 #: build/trans_wms.java:41
 msgid "MLIT Japan (ORTHO02)"
-msgstr ""
+msgstr "MLIT japão (ORTHO02)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO02&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
 #: build/trans_wms.java:42
 msgid "MLIT Japan (ORTHO03)"
-msgstr ""
+msgstr "MLIT japão (ORTHO03)"
 
 #. http://orthophoto.mlit.go.jp:8888/wms/service/wmsRasterTileMap?VERSION=1.3.0&REQUEST=GetMap&LAYERS=ORTHO03&STYLES=Default&CRS=EPSG:4612&BBOX={s},{w},{n},{e}&WIDTH={width}&HEIGHT={height}&FORMAT=image/png&BGCOLOR=OxFFFFFF
@@ -29477,69 +30203,10 @@
 #: build/trans_wms.java:46
 msgid "Lodi - Italy"
-msgstr ""
+msgstr "Lodi - Itália"
 
 #. 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 "Cycleway"
-#~ msgstr "Ciclovia"
-
-#~ msgid "Footway"
-#~ msgstr "Calçada"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "Exige-se Id > 0, obtido {0}"
-
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "Parâmetro \"{0}\" não pode ser nulo"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parâmetro ''{0}'' não pode ser nulo"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "se esperava instância de OsmDataLayer ou GpxLayer. Obtido \"{0}\""
-
-#~ msgid ""
-#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
-#~ "This can lead to nodes being deleted accidentally.\n"
-#~ "Are you really sure to continue?"
-#~ msgstr ""
-#~ "A(s) via(s) selecionadas têm nós selecionados fora da área a baixar.\n"
-#~ "Isto pode acabar apagando nós acidentalmente.\n"
-#~ "Deseja continuar?"
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "O parâmetro \"{0}\" não pode estar vazio"
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "parametro ''{0}'' não é uma classe aceitável, obtido ''{1}''"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr "parâmetro ''{0}'' no intervalo  de 0..{1} esperado, obtido {2}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "parametro {0} > 0 necessário. Obtido {1}."
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "parâmetro atual fora do intervalo: obtido {0}"
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "indice inesperado na coluna. Obtido {0}"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "O parâmetro 'col' deve ser 0 ou 1. Obtido {0}"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Conflitos nos dados"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "imagem"
-#~ msgstr[1] "imagens"
+msgstr "Sicilia - Italia"
 
 #~ msgid "Preparing..."
@@ -29844,14 +30511,6 @@
 #~ msgstr "Somente dois nós permitidos"
 
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr ""
-#~ "Por favor selecione caminhos com ângulos praticamente retos para "
-#~ "ortogonalização"
-
 #~ msgid "Only one node selected"
 #~ msgstr "Somente um nó selecionado"
-
-#~ msgid "Could not rename the file \"{0}\"."
-#~ msgstr "Não foi possível renomear o arquivo \"{0}\"."
 
 #~ msgid "An error occurred while restoring backup file."
@@ -29909,4 +30568,9 @@
 #~ msgid "Images for {0}"
 #~ msgstr "Imagens para {0}"
+
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "imagem"
+#~ msgstr[1] "imagens"
 
 #~ msgid "Synchronize Time with GPS Unit"
@@ -29991,7 +30655,4 @@
 #~ msgid "Unknown file extension."
 #~ msgstr "Extensão de arquivo desconhecida."
-
-#~ msgid "Could not back up file."
-#~ msgstr "Não foi possível fazer backup do arquivo."
 
 #~ msgid "Failed to initialize API. Please try again later."
@@ -30105,7 +30766,22 @@
 #~ msgstr "Oberpfalz Geofabrik.de"
 
+#~ msgid "Boat"
+#~ msgstr "Barco"
+
+#~ msgid "Motorboat"
+#~ msgstr "Barco motorizado"
+
+#~ msgid "Footway"
+#~ msgstr "Calçada"
+
+#~ msgid "Cycleway"
+#~ msgstr "Ciclovia"
+
 #~ msgid "No data"
 #~ msgstr "Não há dados"
 
+#~ msgid ">"
+#~ msgstr ">"
+
 #~ msgid "History item"
 #~ msgstr "Historia do iten"
@@ -30120,7 +30796,4 @@
 #~ msgstr "Copiar padrões"
 
-#~ msgid "Public"
-#~ msgstr "Público"
-
 #~ msgid "All images"
 #~ msgstr "Todas as imagens"
@@ -30129,7 +30802,4 @@
 #~ msgstr "Valores Predefinidos"
 
-#~ msgid "Interpolation"
-#~ msgstr "Interpolação"
-
 #~ msgid "Optional"
 #~ msgstr "Opcional"
@@ -30147,4 +30817,7 @@
 #~ msgstr "Mais detalhes"
 
+#~ msgid "Conflicts in data"
+#~ msgstr "Conflitos nos dados"
+
 #~ msgid "{0} within the track."
 #~ msgstr "{0} dentro da faixa"
@@ -30159,7 +30832,4 @@
 #~ msgstr "Editar Estação"
 
-#~ msgid "Station"
-#~ msgstr "Estação"
-
 #~ msgid "Edit Information Office"
 #~ msgstr "Editar Centro de Informações Turísticas"
@@ -30179,7 +30849,4 @@
 #~ msgid "Board Type"
 #~ msgstr "Tipo de Quadro"
-
-#~ msgid "board"
-#~ msgstr "quadro"
 
 #~ msgid ""
@@ -30253,7 +30920,19 @@
 #~ msgstr "Não consegui encontrar um primitivo com o id {0} neste dataset."
 
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "parâmetro ''{0}'' não pode ser nulo"
+
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr "se esperava instância de OsmDataLayer ou GpxLayer. Obtido \"{0}\""
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "valor não esperado de retorno. Veio {0}"
 
+#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "parametro {0} > 0 necessário. Obtido {1}."
+
+#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
+#~ msgstr "parametro ''{0}'' não é uma classe aceitável, obtido ''{1}''"
+
 #~ msgid "There's no primitive with version {0} in this history."
 #~ msgstr "Não há primitiva com versão {0} neste histórico"
@@ -30262,4 +30941,7 @@
 #~ msgstr "Não há versão válida na data ''{0}'' neste histórico"
 
+#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
+#~ msgstr "parâmetro ''{0}'' no intervalo  de 0..{1} esperado, obtido {2}"
+
 #~ msgid "No earliest version found. History is empty."
 #~ msgstr "não foi encontrada versão anterior. Histórico está vazio."
@@ -30267,4 +30949,13 @@
 #~ msgid "No latest version found. History is empty."
 #~ msgstr "não foi encontrada a última versão. Histórico está vazio."
+
+#~ msgid "Parameter current out of range. Got {0}."
+#~ msgstr "parâmetro atual fora do intervalo: obtido {0}"
+
+#~ msgid "Unexpected column index. Got {0}."
+#~ msgstr "indice inesperado na coluna. Obtido {0}"
+
+#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
+#~ msgstr "O parâmetro 'col' deve ser 0 ou 1. Obtido {0}"
 
 #~ msgid "Index out of bounds. Got {0}."
@@ -30300,4 +30991,22 @@
 #~ msgstr "Substituir"
 
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "Parâmetro \"{0}\" não pode ser nulo"
+
 #~ msgid "Current changeset is null. Can't upload data."
 #~ msgstr "Changeset atual é nulo. Não há como enviar os dados."
+
+#~ msgid "Id > 0 required, got {0}"
+#~ msgstr "Exige-se Id > 0, obtido {0}"
+
+#~ msgid "Parameter ''{0}'' must not be empty"
+#~ msgstr "O parâmetro \"{0}\" não pode estar vazio"
+
+#~ msgid ""
+#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
+#~ "This can lead to nodes being deleted accidentally.\n"
+#~ "Are you really sure to continue?"
+#~ msgstr ""
+#~ "A(s) via(s) selecionadas têm nós selecionados fora da área a baixar.\n"
+#~ "Isto pode acabar apagando nós acidentalmente.\n"
+#~ "Deseja continuar?"
Index: applications/editors/josm/i18n/po/ro.po
===================================================================
--- applications/editors/josm/i18n/po/ro.po	(revision 19689)
+++ applications/editors/josm/i18n/po/ro.po	(revision 19698)
@@ -8,6 +8,6 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 23:20-0500\n"
-"PO-Revision-Date: 2010-01-13 10:57+0000\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-23 22:09+0000\n"
 "Last-Translator: Adi Roiban <adi@roiban.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2010-01-13 18:25+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ROMANIA\n"
@@ -74,11 +74,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -239,5 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -251,13 +251,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -266,5 +266,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -292,5 +295,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Fuzionează"
@@ -319,5 +322,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -384,9 +387,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -394,5 +397,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "OK"
@@ -443,6 +448,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -460,5 +465,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -467,11 +472,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -508,5 +513,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "conflict"
@@ -639,14 +644,14 @@
 msgstr "Selectează te rog cel puţin două căi pentru a le combina."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr ""
@@ -679,8 +684,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -689,5 +694,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -744,10 +749,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Au existat conflicte în timpul importului."
-msgstr[1] "Au existat conflicte în timpul importului."
-msgstr[2] "Au existat conflicte în timpul importului."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
@@ -756,5 +760,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -775,4 +778,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -781,4 +786,32 @@
 #: ../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
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Duplicare"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "Comută starea vizibilă a stratului selectat."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr ""
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "Apropie la {0}"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
 msgstr ""
 
@@ -875,5 +908,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -992,5 +1024,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr ""
@@ -1140,5 +1172,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr ""
 
@@ -1152,10 +1184,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Deschide un fişier."
-msgstr[1] "Deschide un fişier."
-msgstr[2] "Deschide un fişier."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1211,7 +1242,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1225,5 +1256,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr ""
 
@@ -1259,4 +1290,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+msgid "Selection must consist only of ways and nodes."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
 msgid "Orthogonalize"
@@ -1270,4 +1305,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204
 msgid "Selected Elements cannot be orthogonalized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
 msgstr ""
 
@@ -1374,18 +1419,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1410,12 +1455,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Eroare"
@@ -1547,5 +1593,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1739,5 +1785,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1781,5 +1826,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr ""
@@ -2193,6 +2238,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2307,5 +2352,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Caută obiecte"
@@ -2487,5 +2532,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Căutare"
@@ -2525,22 +2570,22 @@
 
 #. case sensitive
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
+msgctxt "search"
+msgid "CS"
+msgstr ""
+
+#. case insensitive
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
-msgid "CS"
-msgstr ""
-
-#. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
-msgctxt "search"
 msgid "CI"
 msgstr ""
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2550,9 +2595,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2685,10 +2730,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "Schimb {0} obiect"
-msgstr[1] "Schimb {0} obiecte"
-msgstr[2] "Schimb {0} de obiecte"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2743,7 +2787,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Caută obiecte"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2801,17 +2845,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Șterge {0} cale"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Șterge {0} cale"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Șterge {0} cale"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2890,10 +2934,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "Schimb {0} obiect"
-msgstr[1] "Schimb {0} obiecte"
-msgstr[2] "Schimb {0} de obiecte"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -2946,5 +2989,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
@@ -3017,7 +3059,6 @@
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:43
-#, fuzzy
 msgid "Do not apply changes"
-msgstr "Nu fă nimic"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:66
@@ -3205,5 +3246,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3211,5 +3252,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3217,5 +3258,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3223,5 +3264,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3341,19 +3382,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3362,5 +3403,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3368,5 +3409,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3489,6 +3530,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3499,5 +3540,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3509,7 +3550,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3531,5 +3572,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "fundal"
@@ -3673,6 +3714,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3680,37 +3721,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "incomplet"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3719,10 +3761,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3731,5 +3773,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3766,6 +3808,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Conflict"
@@ -3776,5 +3818,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-msgid "Authorization Failed"
+msgid "Authorisation Failed"
 msgstr ""
 
@@ -3971,5 +4013,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr ""
@@ -4010,5 +4051,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4019,5 +4060,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Editare"
@@ -4088,29 +4129,29 @@
 msgstr "scală"
 
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
+msgid "The geographic longitude at the mouse pointer."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
-msgid "The geographic longitude at the mouse pointer."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
 msgid "The name of the object at the mouse pointer."
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
+msgid "The geographic latitude at the mouse pointer."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
-msgid "The 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:104
-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:105
-msgid "The (compass) heading of the line segment being drawn."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
 msgid "The length of the new way segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4118,9 +4159,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4280,10 +4321,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "conflict"
-msgstr[1] "conflict"
-msgstr[2] "conflict"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
@@ -4293,5 +4333,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
@@ -4346,16 +4385,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4551,6 +4590,11 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
 msgstr ""
 
@@ -4586,5 +4630,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
@@ -4602,5 +4645,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
@@ -4701,5 +4743,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr ""
@@ -4745,5 +4787,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -4873,10 +4920,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "nici unul"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr ""
@@ -4956,7 +5003,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -4966,6 +5013,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5145,10 +5192,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5168,13 +5215,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Rezolvă"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
@@ -5182,6 +5229,6 @@
 "mai sus."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5215,8 +5262,9 @@
 msgid ""
 "<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions won't be applied unless all differences<br>are "
-"resolved.Click <strong>{0}</strong> to close anyway."
-"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<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 ""
 
@@ -5239,5 +5287,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5246,5 +5294,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5324,43 +5372,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Straturi"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 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:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Arată/Ascunde"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Duplicare"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 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:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Mută stratul selectat un rând în jos."
@@ -5374,6 +5427,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr ""
@@ -5383,69 +5436,69 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Selecţia curentă"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Deschide o fereastra cu o listă de selecţie."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5453,5 +5506,5 @@
 msgstr "Selecţie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5715,5 +5768,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331
@@ -5803,8 +5855,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -5876,4 +5926,7 @@
 #. <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 />
@@ -5952,6 +6005,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -5993,6 +6047,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6461,152 +6517,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Nume"
@@ -6989,5 +7047,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<diferit>"
@@ -7043,55 +7101,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Şterge cheia selectată din toate obiectele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Adaugă o nouă pereche cheie/valoare tuturor obiectelor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Editează valoarea cheii selectata pentru toate obiectele"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7131,5 +7189,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:345
@@ -7413,5 +7470,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
@@ -7535,47 +7591,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Semne de carte"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../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:187
+#: ../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:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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:212
+#: ../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:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr ""
@@ -7696,18 +7751,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -7718,34 +7773,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../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:111
+#: ../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:147
+#: ../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:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr ""
@@ -7756,7 +7811,9 @@
 #. 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" />
@@ -7765,10 +7822,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr ""
@@ -7777,5 +7835,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -7787,17 +7845,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "necunoscut"
@@ -8142,5 +8199,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr ""
@@ -8505,5 +8562,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
@@ -8562,5 +8618,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500
@@ -8583,9 +8638,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8595,7 +8650,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -8607,16 +8662,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "Strat"
@@ -9031,68 +9086,68 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "punct gps"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Personalizează trasarea liniilor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../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:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Personalizează culoarea"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Implicit"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../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:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9102,23 +9157,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Importă imagini"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9128,5 +9183,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9134,5 +9189,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9140,5 +9195,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9148,23 +9203,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9173,5 +9228,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9180,10 +9235,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Converteşte la strat de date"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9191,43 +9246,43 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9236,9 +9291,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9246,5 +9301,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9252,23 +9307,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9277,5 +9332,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9289,5 +9344,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9300,11 +9355,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9313,32 +9368,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} constă în:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9389,28 +9444,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "punct"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Eroare la prelucrarea {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Nu am putut citi \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9419,34 +9473,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9454,64 +9508,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9520,47 +9574,46 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9569,5 +9622,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9575,21 +9628,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 msgid "The selected photos do not contain time information."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -9597,17 +9650,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9616,5 +9669,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9623,56 +9676,56 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Citesc {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Imagini geoetichetate"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
 #, java-format
 msgid "{0} image loaded."
@@ -9680,7 +9733,6 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -9688,12 +9740,11 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -9702,5 +9753,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -9793,5 +9844,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -9799,5 +9850,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -9806,29 +9857,29 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 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:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -9836,17 +9887,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
+#: ../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 "
@@ -9854,5 +9905,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -9860,5 +9911,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr ""
@@ -9884,5 +9935,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
 #, java-format
 msgid ""
@@ -9890,5 +9941,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
 #, java-format
 msgid ""
@@ -10166,8 +10217,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
-#| msgid "Please select at least four nodes."
 msgid "Please select an authorization procedure: "
-msgstr "Vă rog selectaţi cel puţin patru noduri."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10489,5 +10538,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Vă rog selectaţi rândul care va fi editat."
@@ -10501,5 +10550,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10636,9 +10685,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -10668,6 +10712,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr ""
@@ -10706,8 +10750,8 @@
 msgstr ""
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr ""
@@ -10729,13 +10773,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr ""
@@ -10768,12 +10812,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr ""
@@ -11731,5 +11775,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -11737,18 +11788,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -11759,16 +11810,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Eroare la prelucrarea {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -11778,18 +11829,17 @@
 msgstr[2] "Schimb {0} de obiecte"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Modificare proprietăţi"
@@ -12061,6 +12111,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12085,9 +12135,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12110,7 +12160,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
@@ -12182,5 +12238,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr ""
@@ -12281,10 +12337,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Schimb {0} obiect"
-msgstr[1] "Schimb {0} obiecte"
-msgstr[2] "Schimb {0} de obiecte"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -12815,5 +12870,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
@@ -12919,5 +12973,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -12990,5 +13043,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:567
@@ -13274,6 +13326,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -13389,6 +13441,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13397,5 +13449,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -13536,4 +13588,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr ""
@@ -13624,5 +13677,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr ""
@@ -14201,5 +14254,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr ""
@@ -14356,21 +14409,21 @@
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr ""
@@ -14402,9 +14455,9 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -14419,13 +14472,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr ""
@@ -14434,6 +14487,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr ""
@@ -14659,17 +14712,17 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../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:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -14713,42 +14766,41 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr ""
@@ -14804,6 +14856,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -14812,73 +14864,73 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../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:43
+#: ../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:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../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:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../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:55
+#: ../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:57
+#: ../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:59
+#: ../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:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../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:67
+#: ../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:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14886,5 +14938,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -14892,5 +14944,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14898,58 +14950,58 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../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:79
+#: ../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:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../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:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr ""
@@ -14973,5 +15025,5 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr ""
@@ -15002,5 +15054,5 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr ""
@@ -15074,5 +15126,5 @@
 msgstr ""
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr ""
@@ -15329,4 +15381,71 @@
 #: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:135
 msgid "Firefox executable"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+msgid "Read error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Introdu coordonatele pentru noul nod."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+msgid "keep backup files"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Eroare"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "Timpul introdus nu a putut fi interpretat."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Şi redenumeşte şi fişierul"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+msgid "Override old backup files?"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+msgid "Keep old backups and continue"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Suprascrie"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+msgid "Could not delete temporary file!"
 msgstr ""
 
@@ -15600,6 +15719,6 @@
 msgstr ""
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -15721,72 +15840,124 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+msgid "Terrace a house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+#, fuzzy
+msgid "Interpolation"
+msgstr "Informaţii"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Selectaţi"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+msgid "Highest Number"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+msgid "Lowest Number"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+msgid "Lowest housenumber of the terraced house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "create an associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Șterge {0} cale"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+msgid "Street name: "
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../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:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr ""
@@ -16019,5 +16190,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr ""
@@ -16027,5 +16198,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16034,9 +16205,9 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr ""
@@ -16071,5 +16242,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr ""
@@ -16214,7 +16385,7 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -16222,80 +16393,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16303,86 +16474,86 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "Şterge sursele selectate din listă."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -16822,5 +16993,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -16831,63 +17002,63 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+msgid "Download visible tiles"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
-msgid "Download visible tiles"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr "Salvează strat WMS"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -17138,6 +17309,13 @@
 msgstr ""
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17146,15 +17324,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17163,10 +17341,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17175,15 +17353,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17193,10 +17371,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17205,5 +17383,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17212,10 +17390,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -17322,6 +17500,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -17329,6 +17516,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr ""
@@ -17345,5 +17533,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr ""
@@ -17365,10 +17553,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -17412,14 +17600,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr ""
@@ -17462,13 +17650,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -17506,13 +17694,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr ""
@@ -17547,13 +17735,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr ""
@@ -17588,13 +17776,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr ""
@@ -17725,4 +17913,13 @@
 #: build/trans_presets.java:225
 msgid "Edit Unclassified Road"
+msgstr ""
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
 msgstr ""
 
@@ -17741,15 +17938,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr ""
@@ -17761,5 +17958,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr ""
@@ -17768,5 +17965,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr ""
@@ -17784,16 +17981,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr ""
@@ -17815,166 +18015,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr ""
@@ -17982,5 +18189,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr ""
@@ -17989,5 +18196,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr ""
@@ -17995,5 +18202,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr ""
@@ -18002,5 +18209,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr ""
@@ -18008,5 +18215,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr ""
@@ -18015,5 +18222,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr ""
@@ -18023,18 +18230,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr ""
@@ -18042,5 +18249,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr ""
@@ -18050,5 +18257,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -18056,5 +18263,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -18063,5 +18270,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -18070,20 +18277,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -18091,9 +18298,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 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"
@@ -18104,6 +18312,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18115,4 +18321,5 @@
 #. 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"
@@ -18131,141 +18338,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr ""
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr ""
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr ""
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr ""
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr ""
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr ""
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -18280,10 +18495,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr ""
@@ -18299,10 +18514,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr ""
@@ -18317,27 +18532,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr ""
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr ""
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr ""
@@ -18345,25 +18552,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr ""
@@ -18374,5 +18581,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr ""
@@ -18392,10 +18599,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr ""
@@ -18417,10 +18624,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr ""
@@ -18442,10 +18649,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr ""
@@ -18467,5 +18674,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -18480,9 +18687,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr ""
@@ -18496,9 +18703,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr ""
@@ -18528,10 +18735,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr ""
@@ -18561,5 +18768,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -18571,10 +18778,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr ""
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr ""
@@ -18582,19 +18789,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr ""
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr ""
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr ""
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr ""
@@ -18610,5 +18817,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr ""
@@ -18616,5 +18823,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr ""
@@ -18623,34 +18830,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -18658,5 +18865,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -18664,26 +18871,26 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
 msgstr ""
@@ -18691,5 +18898,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr ""
@@ -18698,6 +18905,27 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
+msgstr ""
+
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
 msgstr ""
 
@@ -18764,11 +18992,10 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "Combină oricum"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr ""
@@ -18777,10 +19004,9 @@
 #. <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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr ""
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr ""
@@ -18788,5 +19014,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr ""
@@ -18796,5 +19022,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr ""
@@ -18802,10 +19028,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr ""
@@ -18813,15 +19039,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr ""
@@ -18829,5 +19055,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr ""
@@ -18835,5 +19061,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -18866,17 +19093,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr ""
@@ -18885,5 +19112,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr ""
@@ -18893,5 +19120,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -18900,27 +19127,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr ""
@@ -18928,6 +19155,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr ""
@@ -18936,11 +19163,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -18948,30 +19175,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr ""
@@ -18979,5 +19206,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -18986,14 +19213,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr ""
@@ -19004,14 +19277,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr ""
@@ -19021,26 +19294,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr ""
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr ""
@@ -19048,5 +19323,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr ""
@@ -19054,5 +19329,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr ""
@@ -19060,11 +19335,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr ""
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr ""
@@ -19072,5 +19354,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr ""
@@ -19078,5 +19360,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -19088,7 +19370,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr ""
@@ -19096,5 +19378,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr ""
@@ -19102,5 +19384,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr ""
@@ -19108,5 +19390,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr ""
@@ -19151,16 +19433,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr ""
@@ -19169,5 +19451,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr ""
@@ -19175,5 +19457,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr ""
@@ -19181,10 +19463,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr ""
@@ -19192,15 +19474,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr ""
@@ -19208,5 +19490,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr ""
@@ -19214,10 +19496,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr ""
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr ""
@@ -19227,5 +19509,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr ""
@@ -19234,12 +19516,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
-msgid "Fence"
-msgstr ""
-
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#: build/trans_presets.java:817 build/trans_presets.java:819
+msgid "Fence"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr ""
@@ -19247,5 +19541,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr ""
@@ -19254,5 +19548,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr ""
@@ -19264,15 +19558,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr ""
@@ -19280,50 +19575,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr ""
@@ -19331,25 +19626,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr ""
@@ -19360,11 +19655,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr ""
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr ""
@@ -19372,5 +19667,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr ""
@@ -19378,5 +19673,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr ""
@@ -19384,10 +19679,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr ""
@@ -19395,10 +19701,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr ""
@@ -19406,10 +19712,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr ""
@@ -19419,5 +19725,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr ""
@@ -19425,15 +19731,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr ""
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr ""
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr ""
@@ -19441,15 +19747,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr ""
@@ -19457,15 +19763,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -19473,5 +19779,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr ""
@@ -19480,10 +19786,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr ""
@@ -19494,14 +19800,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr ""
@@ -19515,35 +19821,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr ""
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr ""
@@ -19551,20 +19857,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr ""
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr ""
@@ -19572,10 +19878,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr ""
@@ -19583,5 +19889,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr ""
@@ -19589,5 +19895,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr ""
@@ -19595,5 +19901,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr ""
@@ -19602,5 +19908,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr ""
@@ -19608,10 +19914,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr ""
@@ -19619,5 +19925,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr ""
@@ -19625,5 +19931,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr ""
@@ -19631,15 +19937,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr ""
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr ""
@@ -19648,5 +19954,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr ""
@@ -19654,20 +19960,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr ""
@@ -19676,15 +19982,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr ""
@@ -19692,10 +19998,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr ""
@@ -19703,10 +20009,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr ""
@@ -19716,20 +20022,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr ""
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr ""
@@ -19737,5 +20043,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr ""
@@ -19744,139 +20050,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr ""
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr ""
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr ""
+
+#. item "Man Made/Power Line" text "Line reference"
+#. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
+#: build/trans_presets.java:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr ""
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr ""
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr ""
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr ""
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr ""
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr ""
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr ""
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr ""
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr ""
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr ""
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr ""
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr ""
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr ""
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr ""
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr ""
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr ""
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr ""
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr ""
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr ""
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr ""
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr ""
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr ""
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr ""
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr ""
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr ""
@@ -19885,5 +20430,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr ""
@@ -19892,5 +20437,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr ""
@@ -19900,5 +20445,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr ""
@@ -19906,5 +20451,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr ""
@@ -19913,10 +20458,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr ""
@@ -19924,10 +20476,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr ""
@@ -19935,10 +20487,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr ""
@@ -19946,10 +20498,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr ""
@@ -19957,10 +20509,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -19968,12 +20520,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr ""
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr ""
@@ -19983,9 +20548,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr ""
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20039,32 +20661,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr ""
@@ -20123,94 +20745,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20222,5 +20920,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20230,5 +20928,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr ""
@@ -20239,25 +20937,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr ""
@@ -20266,48 +20964,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr ""
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr ""
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr ""
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr ""
@@ -20315,5 +21013,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr ""
@@ -20322,10 +21020,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr ""
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr ""
@@ -20333,5 +21031,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr ""
@@ -20339,10 +21037,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr ""
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr ""
@@ -20351,15 +21049,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr ""
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr ""
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -20369,5 +21067,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -20375,5 +21073,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr ""
@@ -20381,5 +21079,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr ""
@@ -20387,5 +21085,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr ""
@@ -20393,5 +21091,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr ""
@@ -20400,5 +21098,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr ""
@@ -20406,5 +21104,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr ""
@@ -20413,5 +21111,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr ""
@@ -20423,5 +21121,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr ""
@@ -20429,10 +21127,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr ""
@@ -20441,10 +21139,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr ""
@@ -20453,5 +21151,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr ""
@@ -20460,5 +21158,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr ""
@@ -20466,5 +21164,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr ""
@@ -20474,5 +21172,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr ""
@@ -20481,25 +21179,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr ""
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr ""
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr ""
@@ -20507,5 +21206,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr ""
@@ -20513,5 +21212,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr ""
@@ -20519,32 +21218,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr ""
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr ""
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr ""
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr ""
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr ""
@@ -20556,5 +21350,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -20563,15 +21357,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr ""
@@ -20579,20 +21373,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr ""
@@ -20600,10 +21394,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr ""
@@ -20611,30 +21405,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr ""
@@ -20642,10 +21436,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr ""
@@ -20656,5 +21450,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
@@ -20662,5 +21456,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr ""
@@ -20668,5 +21462,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr ""
@@ -20674,61 +21468,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr ""
@@ -20736,9 +21542,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr ""
@@ -20746,9 +21560,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr ""
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr ""
@@ -20756,18 +21570,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr ""
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr ""
@@ -20775,9 +21589,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr ""
@@ -20785,24 +21599,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr ""
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr ""
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr ""
@@ -20810,9 +21624,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr ""
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr ""
@@ -20821,9 +21635,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr ""
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr ""
@@ -20831,24 +21645,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr ""
@@ -20856,5 +21670,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr ""
@@ -20862,19 +21676,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr ""
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr ""
@@ -20912,5 +21726,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -20918,28 +21732,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr ""
@@ -20949,5 +21763,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr ""
@@ -20955,5 +21769,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr ""
@@ -20961,6 +21775,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr ""
@@ -20968,5 +21782,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr ""
@@ -20974,6 +21788,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr ""
@@ -20981,5 +21795,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr ""
@@ -20987,46 +21801,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr ""
@@ -21034,29 +21848,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr ""
@@ -21064,25 +21878,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr ""
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr ""
@@ -21091,19 +21905,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr ""
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr ""
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr ""
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr ""
@@ -21112,9 +21926,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr ""
@@ -21122,10 +21936,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr ""
@@ -21133,5 +21947,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -21139,15 +21953,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr ""
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr ""
@@ -21155,55 +21969,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr ""
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr ""
@@ -21211,35 +22025,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr ""
@@ -21253,6 +22067,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr ""
@@ -21644,6 +22458,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -21677,225 +22491,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr ""
@@ -21934,21 +22748,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr ""
@@ -21987,203 +22801,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr ""
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr ""
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr ""
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr ""
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr ""
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr ""
@@ -22191,56 +23005,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr ""
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr ""
@@ -22248,182 +23058,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr ""
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr ""
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr ""
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr ""
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr ""
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr ""
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr ""
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr ""
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr ""
@@ -22431,5 +23241,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr ""
@@ -22437,10 +23247,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr ""
@@ -22448,10 +23258,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr ""
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr ""
@@ -22459,10 +23269,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr ""
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr ""
@@ -22471,10 +23281,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr ""
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr ""
@@ -22483,10 +23293,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr ""
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr ""
@@ -22496,10 +23306,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr ""
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr ""
@@ -22508,10 +23318,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr ""
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr ""
@@ -22519,5 +23329,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr ""
@@ -22525,15 +23335,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr ""
@@ -22541,10 +23351,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr ""
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr ""
@@ -22552,10 +23362,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr ""
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr ""
@@ -22563,5 +23373,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr ""
@@ -22569,5 +23379,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr ""
@@ -22576,10 +23386,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr ""
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr ""
@@ -22588,9 +23398,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr ""
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr ""
@@ -22598,10 +23408,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr ""
@@ -22610,10 +23420,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr ""
@@ -22623,5 +23433,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr ""
@@ -22630,6 +23440,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr ""
@@ -22638,66 +23448,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr ""
@@ -22706,81 +23516,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr ""
@@ -22789,5 +23599,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr ""
@@ -22795,5 +23605,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr ""
@@ -22801,25 +23611,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr ""
@@ -22828,5 +23638,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -22834,61 +23644,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr ""
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr ""
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr ""
@@ -22896,25 +23706,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr ""
@@ -22922,10 +23732,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr ""
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr ""
@@ -22933,10 +23743,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr ""
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr ""
@@ -22945,37 +23755,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr ""
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
+msgid "gas"
+msgstr ""
+
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr ""
+
+#: build/trans_presets.java:2353
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-msgid "gas"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr ""
@@ -22985,10 +23795,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr ""
@@ -22996,21 +23806,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
-msgstr ""
-
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr ""
@@ -23018,10 +23823,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr ""
@@ -23029,11 +23834,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr ""
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr ""
@@ -23043,35 +23860,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr ""
@@ -23080,10 +23897,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr ""
@@ -23092,5 +23909,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -23098,10 +23915,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr ""
@@ -23112,23 +23929,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr ""
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr ""
@@ -23137,79 +23954,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr ""
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr ""
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr ""
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr ""
@@ -23218,5 +24030,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr ""
@@ -23224,5 +24036,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr ""
@@ -23230,5 +24042,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr ""
@@ -23236,5 +24048,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -23242,5 +24054,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr ""
@@ -23248,15 +24060,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr ""
@@ -23265,5 +24077,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr ""
@@ -23271,31 +24083,42 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+msgid "Edit Waste Basket"
 msgstr ""
 
@@ -23303,31 +24126,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr ""
@@ -23406,5 +24229,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -23414,31 +24237,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -23447,30 +24270,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr ""
@@ -23479,10 +24302,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr ""
@@ -23491,10 +24314,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr ""
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr ""
@@ -23502,15 +24338,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr ""
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr ""
@@ -23518,10 +24354,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr ""
@@ -23530,28 +24366,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr ""
@@ -23559,9 +24395,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr ""
@@ -23569,27 +24405,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr ""
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr ""
@@ -23597,5 +24433,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr ""
@@ -23603,88 +24439,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr ""
@@ -23692,9 +24528,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr ""
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr ""
@@ -23702,9 +24538,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr ""
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr ""
@@ -23712,18 +24548,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr ""
@@ -23731,54 +24567,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr ""
@@ -23786,9 +24622,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr ""
@@ -23796,9 +24632,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr ""
@@ -23806,54 +24642,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr ""
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr ""
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr ""
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr ""
@@ -23861,9 +24697,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr ""
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr ""
@@ -23871,9 +24707,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr ""
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr ""
@@ -23881,28 +24717,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr ""
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr ""
@@ -23910,14 +24746,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr ""
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr ""
@@ -23925,5 +24761,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr ""
@@ -23931,15 +24767,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr ""
@@ -23947,18 +24783,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr ""
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr ""
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr ""
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr ""
@@ -23966,5 +24802,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr ""
@@ -23972,9 +24808,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr ""
@@ -23982,10 +24818,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr ""
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr ""
@@ -23994,5 +24830,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -24001,20 +24837,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -24022,5 +24858,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr ""
@@ -24029,64 +24865,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr ""
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr ""
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr ""
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr ""
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr ""
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr ""
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr ""
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr ""
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr ""
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr ""
@@ -24094,15 +24930,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr ""
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr ""
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr ""
@@ -24110,10 +24946,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr ""
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr ""
@@ -24121,25 +24957,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr ""
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr ""
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr ""
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr ""
@@ -24147,5 +24983,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr ""
@@ -24153,10 +24989,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr ""
@@ -24164,10 +25000,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr ""
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr ""
@@ -24175,5 +25011,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr ""
@@ -24181,5 +25017,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr ""
@@ -24187,10 +25023,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr ""
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr ""
@@ -24198,10 +25034,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr ""
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr ""
@@ -24209,10 +25045,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr ""
@@ -24220,70 +25056,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr ""
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr ""
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr ""
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr ""
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr ""
@@ -24292,15 +25128,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr ""
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr ""
@@ -24309,5 +25145,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr ""
@@ -24315,17 +25151,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr ""
@@ -24334,14 +25170,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr ""
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -24349,25 +25185,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr ""
@@ -24375,10 +25211,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr ""
@@ -24386,5 +25222,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr ""
@@ -24392,5 +25228,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr ""
@@ -24399,45 +25235,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr ""
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -24445,25 +25281,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr ""
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr ""
@@ -24471,10 +25307,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr ""
@@ -24482,20 +25318,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr ""
@@ -24503,5 +25339,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -24509,15 +25345,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr ""
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr ""
@@ -24525,9 +25361,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr ""
@@ -24535,39 +25371,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr ""
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr ""
@@ -24575,15 +25411,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr ""
@@ -24591,50 +25427,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr ""
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr ""
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr ""
@@ -24644,5 +25480,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr ""
@@ -24651,10 +25487,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr ""
@@ -24662,5 +25498,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr ""
@@ -24669,5 +25505,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -24675,34 +25511,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr ""
@@ -24711,15 +25547,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr ""
@@ -24727,5 +25563,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr ""
@@ -24734,5 +25570,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr ""
@@ -24740,5 +25576,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr ""
@@ -24829,5 +25665,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -24837,17 +25673,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr ""
@@ -24907,5 +25743,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -24914,9 +25750,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr ""
@@ -24930,10 +25766,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr ""
@@ -24941,31 +25777,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr ""
@@ -24974,106 +25810,31 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 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 ""
 
@@ -25609,77 +26370,4 @@
 #: build/trans_style.java:975 build/trans_style.java:983
 msgid "highway_track"
-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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
 msgstr ""
 
@@ -29206,10 +29894,4 @@
 msgstr ""
 
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "imagine"
-#~ msgstr[1] "imagini"
-#~ msgstr[2] "de imagini"
-
 #~ msgid "Incorrect password or username."
 #~ msgstr "Parolă sau nume utilizator incorecte."
@@ -29287,7 +29969,4 @@
 #~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 #~ msgstr "Introduceţi data afişată (ll/zz/aaaa HH:MM:SS)"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Timpul introdus nu a putut fi interpretat."
 
 #~ msgid "Error while parsing"
@@ -29359,4 +30038,10 @@
 #~ msgstr "Imagini pentru {0}"
 
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "imagine"
+#~ msgstr[1] "imagini"
+#~ msgstr[2] "de imagini"
+
 #~ msgid "{0} object has conflicts:"
 #~ msgid_plural "{0} objects have conflicts:"
Index: applications/editors/josm/i18n/po/ru.po
===================================================================
--- applications/editors/josm/i18n/po/ru.po	(revision 19689)
+++ applications/editors/josm/i18n/po/ru.po	(revision 19698)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 23:20-0500\n"
-"PO-Revision-Date: 2010-01-18 23:59-0500\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-27 19:21+0000\n"
 "Last-Translator: Calibrator <Unknown>\n"
 "Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-01-13 18:27+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:35+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
@@ -73,11 +73,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -246,5 +246,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -258,13 +258,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -273,5 +273,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -299,5 +302,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Объединить"
@@ -328,5 +331,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -393,9 +396,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -403,5 +406,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "OK"
@@ -452,6 +457,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -469,5 +474,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -476,11 +481,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -518,5 +523,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "конфликта"
@@ -651,14 +656,14 @@
 msgstr "Выделите не менее двух линий для объединения."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Копировать"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Копировать выделенные объекты в буфер обмена."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Выделите что-нибудь для копирования."
@@ -690,8 +695,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -700,5 +705,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -755,18 +760,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "За время импорта произошло {0} конфликт(ов)"
-msgstr[1] "За время импорта произошло {0} конфликт(ов)"
-msgstr[2] "За время импорта произошло {0} конфликт(ов)"
+msgstr[0] "Произошло {0} конфликт во время импорта."
+msgstr[1] "Произошло {0} конфликта во время импорта."
+msgstr[2] "Произошло {0} конфликтов во время импорта."
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "Конфликт во время скачивания"
-msgstr[1] "Конфликт во время скачивания"
-msgstr[2] "Конфликт во время скачивания"
+msgstr[0] "Конфликт во время скачивания с сервера"
+msgstr[1] "Конфликта во время скачивания с сервера"
+msgstr[2] "Конфликтов во время скачивания с сервера"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -787,4 +791,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -794,4 +800,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Создать копию выделения копированием и вставкой."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Дублировать линию"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+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:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "Слой: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, 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 ""
 
 #. <button label="Info" hotkey="I">
@@ -844,5 +878,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:19
 msgid "Object history"
-msgstr "История объекта"
+msgstr "История элемента"
 
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
@@ -857,5 +891,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:17
 msgid "Display object information about OSM nodes, ways, or relations."
-msgstr "Показать информацию об объектах OSM: линиях, точках или отношениях."
+msgstr "Показать информацию об элементах OSM: линиях, точках или отношениях."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:114
@@ -884,21 +918,20 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 msgid "The selected way has nodes outside of the downloaded data region."
 msgid_plural ""
 "The selected ways have nodes outside of the downloaded data region."
-msgstr[0] "Выделенная линия не содержит все выделенные точки"
-msgstr[1] "Выбранная линия не содержит выбранных точек"
-msgstr[2] "Выделенная линия не содержит все выбранные точки"
+msgstr[0] "Выбранная линия содержит точки за пределами области скачивания."
+msgstr[1] "Выбранные линии содержат точки за пределами области скачивания."
+msgstr[2] "Выбранные линии содержат точки за пределами области скачивания."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68
 msgid "This can lead to nodes being deleted accidentally."
-msgstr ""
+msgstr "Это может привести к случайному удалению точек."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:156
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:69
 msgid "Are you really sure to continue?"
-msgstr ""
+msgstr "Вы действительно хотите продолжить?"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157
@@ -1011,5 +1044,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "URL"
@@ -1163,5 +1196,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+#, fuzzy
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr "<html>Невозможно открыть каталог.<br>Пожалуйста, выберите файл!"
 
@@ -1175,8 +1209,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Открытие {0} файлов..."
+msgstr[0] "Открытие {0} файла..."
 msgstr[1] "Открытие {0} файлов..."
 msgstr[2] "Открытие {0} файлов..."
@@ -1233,11 +1267,19 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
-msgid ""
-"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 "
+#, fuzzy
+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 ""
+"Когда выделена одна или более линий, форма будет изменена так, чтобы каждый "
+"угол стал или 90 или 180 градусов.<h3>Вы можете дополнительно выделить ещё "
+"две любые произвольные точки (не на этих линиях). Тогда, направление будет "
+"определено этими двумя вспомогательными точками. (При необходимости, вы "
+"сможете отменить передвижение некоторых передвинувшихся точек:<br>Выделите "
+"их и нажмите клавиатурное сокращение \"Ортогонализовать/Отмена\". По "
+"умолчанию это: Shift-Q.)"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
@@ -1248,7 +1290,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
-msgstr ""
-"Выстроить точки таким образом, чтобы углы между линиями были 90 или 270 "
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
+msgstr ""
+"Выстроить точки таким образом, чтобы углы между линиями были 90 или 180 "
 "градусов"
 
@@ -1291,4 +1334,9 @@
 "</html>"
 
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+#, fuzzy
+msgid "Selection must consist only of ways and nodes."
+msgstr "Мультиполигон должен состоять только из замкнутых линий."
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
 msgid "Orthogonalize"
@@ -1303,4 +1351,17 @@
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "Выделенные элементы невозможно ортогонализировать"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr ""
+"Пожалуйста, выберите контуры, у которых углы почти прямые, для применения "
+"функции."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1364,5 +1425,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Open a preferences dialog for global settings."
-msgstr "Открыть диалог параметров для общих настроек."
+msgstr "Открыть диалог настроек для общих установок."
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
@@ -1411,18 +1472,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1447,12 +1508,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Ошибка"
@@ -1588,5 +1650,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1722,5 +1784,5 @@
 #, java-format
 msgid "Toggles the global setting ''{0}''."
-msgstr "Включает/выключает глобальную установку: «{0}»."
+msgstr "Переключает глобальную настройку: ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:53
@@ -1800,10 +1862,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "Дублировать {0} точек в {1} точек"
-msgstr[1] "Дублировать {0} точек в {1} точек"
-msgstr[2] "Дублировать {0} точек в {1} точек"
+msgstr[0] "Создать {1} копию точки {0}"
+msgstr[1] "Создать {1} копии точки {0}"
+msgstr[2] "Создать {1} копий точки {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1847,5 +1909,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr "Скачать данные"
@@ -2026,9 +2088,9 @@
 msgctxt "audio"
 msgid "Play/Pause"
-msgstr "Воспроизвести/пауза"
+msgstr "Воспроизведение/Пауза"
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java:18
 msgid "Play/pause audio."
-msgstr "Воспроизвести/пауза"
+msgstr "Воспроизведение/пауза аудио."
 
 #: ../core/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java:17
@@ -2285,6 +2347,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2369,40 +2431,38 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
-#, fuzzy
 msgid "<not>"
-msgstr "север"
+msgstr "<not>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
 msgid "<or>"
-msgstr ""
+msgstr "<or>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
 msgid "<left parent>"
-msgstr ""
+msgstr "<left parent>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
-#, fuzzy
 msgid "<right parent>"
-msgstr "Отсутствует закрывающая скобка"
+msgstr "<right parent>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
 msgid "<colon>"
-msgstr ""
+msgstr "<colon>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
 msgid "<equals>"
-msgstr ""
+msgstr "<equals>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:27
 msgid "<key>"
-msgstr ""
+msgstr "<key>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:27
 msgid "<question mark>"
-msgstr ""
+msgstr "<question mark>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:27
 msgid "<end-of-file>"
-msgstr ""
+msgstr "<end-of-file>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
@@ -2412,5 +2472,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Поиск объектов."
@@ -2485,5 +2545,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
-msgstr ""
+msgstr "<b>oneway?</b> - oneway=yes, true, 1 или on"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125
@@ -2504,5 +2564,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:128
 msgid "<b>user:</b>... - all objects changed by user"
-msgstr "<b>user:</b>... - все объекты, измененные заданным пользователем"
+msgstr "<b>user:</b>... - все объекты, изменённые пользователем"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
@@ -2557,5 +2617,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
 msgid "<b>modified</b> - all changed objects"
-msgstr "<b>modified</b> - все измененные объекты"
+msgstr "<b>modified</b> - все изменённые объекты"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:137
@@ -2618,5 +2678,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Поиск"
@@ -2656,6 +2716,5 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
@@ -2663,6 +2722,5 @@
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
@@ -2670,11 +2728,10 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
 msgstr "RX"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2687,5 +2744,5 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2693,5 +2750,5 @@
 "использования: ключ=значение"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2715,7 +2772,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
-msgstr "Неожиданный знак: {0}"
+msgstr "Неожиданный маркер. Ожидалось {0}, найдено {1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
@@ -2839,9 +2896,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "Добавлено {0} объектов"
-msgstr[1] "Добавлено {0} объектов"
+msgstr[0] "Добавлен {0} объект"
+msgstr[1] "Добавлено {0} объекта"
 msgstr[2] "Добавлено {0} объектов"
 
@@ -2892,12 +2949,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "Удалить \"{0}\" для {1} {2}"
+msgstr "Удалить \"{0}\" для {1} объектов"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Установить {0}={1} для {2} {3}"
+msgstr "Установить {0}={1} для {2} объектов"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2960,17 +3017,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Режим удаления"
+msgstr "Удалить точку {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Удалить {0} линию"
+msgstr "Удалить линию {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Удалить {0} отношение"
+msgstr "Удалить отношение {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -3056,10 +3113,10 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "Очищено объектов: {0}"
-msgstr[1] "Очищено объектов: {0}"
-msgstr[2] "Очищено объектов: {0}"
+msgstr[0] "Очищен {0} объект"
+msgstr[1] "Очищено {0} объекта"
+msgstr[2] "Очищено {0} объектов"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -3110,25 +3167,25 @@
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "Undelete {0} primitive"
 msgid_plural "Undelete {0} primitives"
-msgstr[0] "Восстановить {0} удаленных элементов"
-msgstr[1] "Восстановить {0} удаленных элементов"
-msgstr[2] "Восстановить {0} удаленных элементов"
+msgstr[0] "Восстановить {0} элемент"
+msgstr[1] "Восстановить {0} элемента"
+msgstr[2] "Восстановить {0} элементов"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for node {0}"
-msgstr "Устранить конфликты версий для точки {0}"
+msgstr "Устранить конфликт версии для точки {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for way {0}"
-msgstr "Устранить конфликты версий для линии {0}"
+msgstr "Устранить конфликт версии для линии {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Устранить конфликты версий для отношения {0}"
+msgstr "Устранить конфликт версии для отношения {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3222,5 +3279,5 @@
 #, java-format
 msgid "Warning: failed to persist preferences to ''{0}''"
-msgstr "Ошибка: не удается сохранить свойства для ''{0}''"
+msgstr "Предупреждение: не удается сохранить настройки в ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:440
@@ -3253,6 +3310,6 @@
 "preference directory: {0}"
 msgstr ""
-"Предупреждение: Ошибка инициализации параметров. Не удается создать "
-"отсутствующий каталог параметров: {0}"
+"Предупреждение: Ошибка инициализации настроек. Не удается создать "
+"отсутствующий каталог настроек: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
@@ -3262,6 +3319,6 @@
 "preference directory: {0}</html>"
 msgstr ""
-"<html>Ошибка инициализации параметров.<br>Не удается создать отсутствующий "
-"каталог параметров: {0}</html>"
+"<html>Ошибка инициализации настроек.<br>Не удается создать отсутствующий "
+"каталог настроек: {0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
@@ -3288,6 +3345,6 @@
 "to default: {0}</html>"
 msgstr ""
-"<html>Ошибка инициализации параметров.<br>Не удалось сбросить файл "
-"параметров к состоянию по умолчанию: {0}</html>"
+"<html>Ошибка инициализации настроек.<br>Не удалось сбросить файл параметров "
+"к состоянию по умолчанию: {0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
@@ -3306,6 +3363,6 @@
 "default: {0}"
 msgstr ""
-"Предупреждение: Ошибка инициализации параметров. Не удалось сбросить файл "
-"параметров {0} к состоянию по умолчанию."
+"Предупреждение: Ошибка инициализации настроек. Не удалось сбросить файл "
+"настроек {0} к состоянию по умолчанию."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
@@ -3325,14 +3382,14 @@
 #, java-format
 msgid "Preferences stored on {0}"
-msgstr "Параметры сохранены на {0}"
+msgstr "Настройки сохранены {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:102
 #, java-format
 msgid "Could not upload preferences. Reason: {0}"
-msgstr "Невозможно загрузить параметры. Причина: {0}"
+msgstr "Невозможно загрузить настройки. Причина: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:118
 msgid "Could not load preferences from server."
-msgstr "Невозможно скачать параметры с сервера."
+msgstr "Невозможно скачать настройки с сервера."
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:201
@@ -3401,5 +3458,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3407,5 +3464,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3413,5 +3470,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3419,5 +3476,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3491,8 +3548,7 @@
 #. column header: hide filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
-#, fuzzy
 msgctxt "filter"
 msgid "H"
-msgstr "С"
+msgstr "H"
 
 #. column header: filter text
@@ -3504,67 +3560,60 @@
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "М"
+msgstr "C"
 
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
-#, fuzzy
 msgctxt "filter"
 msgid "I"
-msgstr "И"
+msgstr "I"
 
 #. column header: filter mode
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
-#, fuzzy
 msgctxt "filter"
 msgid "M"
-msgstr "Р"
+msgstr "M"
 
 #. translators notes must be in front
 #. filter mode: replace
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210
-#, fuzzy
 msgctxt "filter"
 msgid "R"
-msgstr "З"
+msgstr "R"
 
 #. filter mode: add
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211
-#, fuzzy
 msgctxt "filter"
 msgid "A"
-msgstr "Д"
+msgstr "A"
 
 #. filter mode: remove
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212
-#, fuzzy
 msgctxt "filter"
 msgid "D"
-msgstr "У"
+msgstr "D"
 
 #. filter mode: in selection
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213
-#, fuzzy
 msgctxt "filter"
 msgid "F"
-msgstr "В"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+msgstr "F"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "Элемент с id=0 не может быть невидимым"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "обнаружено id > 0. Получено {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "обнаружена версия > 0. Получено {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3575,11 +3624,11 @@
 "- {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 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:1043
+msgstr "Невозможно слияние, потому что часть элементов новые, а часть нет"
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3711,6 +3760,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3721,5 +3770,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3731,7 +3780,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3754,5 +3803,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "фон"
@@ -3899,6 +3948,6 @@
 msgstr "Не показывать снова (запомнить выбор)"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3906,37 +3955,38 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "неполный"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "дорога"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "железная дорога"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "водоём"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "землепользование"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3946,10 +3996,10 @@
 msgstr[2] "{0} точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr "общественный транспорт"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3959,5 +4009,5 @@
 msgstr[2] "{0} участников"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3994,6 +4044,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Конфликт"
@@ -4001,9 +4051,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:249
 msgid "Authentication Failed"
-msgstr "Аутентификация не удалась"
+msgstr "Идентификация личности не удалась"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-#| msgid "Authorisation Failed"
-msgid "Authorization Failed"
+msgid "Authorisation Failed"
 msgstr "Авторизация не удалась"
 
@@ -4011,5 +4060,5 @@
 #, fuzzy
 msgid "Authentication failed"
-msgstr "Аутентификация не удалась"
+msgstr "Идентификация не удалась"
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:299
@@ -4048,9 +4097,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:38
 msgid "Upload Preferences"
-msgstr "Загрузить параметры"
+msgstr "Загрузить настройки"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
 msgid "Upload the current preferences to the server"
-msgstr "Загрузить текущие параметры на сервер"
+msgstr "Загрузить текущие настройки на сервер"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:54
@@ -4169,5 +4218,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:84
 msgid "Reset the preferences to default"
-msgstr "Восстановить параметры по умолчанию"
+msgstr "Восстановить настройки по умолчанию"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85
@@ -4218,5 +4267,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Инициализация"
@@ -4259,5 +4307,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4268,5 +4316,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Правка"
@@ -4337,29 +4385,29 @@
 msgstr "масштаб"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Географическая долгота положения курсора"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The name of the object at the mouse pointer."
 msgstr "Название объекта, на который наведён курсор"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Географическая широта положения курсора"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The angle between the previous and the current way segment."
 msgstr "Угол между предыдущим и текущим сегментом линии"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Путевой угол создаваемого сегмента"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 msgid "The length of the new way segment being drawn."
 msgstr "Длина создаваемого сегмента линии"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4369,9 +4417,9 @@
 "<br>Удерживайте CTRL, чтобы выбрать мышкой, напрямую из списка.<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(нет объекта)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4538,18 +4586,18 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Теги ({0} конфликтов)"
-msgstr[1] "Теги ({0} конфликтов)"
-msgstr[2] "Теги ({0} конфликтов)"
+msgstr[0] "Теги({0} конфликт)"
+msgstr[1] "Теги({0} конфликта)"
+msgstr[2] "Теги({0} конфликтов)"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "{0} pending tag conflict to be resolved"
 msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} неустранённых конфликтов тегов"
-msgstr[1] "{0} неустранённых конфликтов тегов"
-msgstr[2] "{0} неустранённых конфликтов тегов"
+msgstr[0] "Предстоит устранить {0} отложенный кофликт тегов"
+msgstr[1] "Предстоит устранить {0} отложенных кофликта тегов"
+msgstr[2] "Предстоит устранить {0} отложенных кофликта тегов"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
@@ -4608,16 +4656,16 @@
 msgstr "Конфликт в разрешении изображения"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, 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:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "недопустимое значение параметра \"index\". Текущее значение {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4834,9 +4882,14 @@
 msgstr "Узел"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr ""
 "Объединённые точки ещё не заблокированы. Невозможно построить команду "
 "устранения конфликтов."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr "Точка {0} не может быть добавлена к линии, потому что она была удалена"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4864,5 +4917,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional node used by way {1}<br>which is deleted on the "
@@ -4872,15 +4925,12 @@
 "server.<br><br>Do you want to undelete these nodes too?"
 msgstr[0] ""
-"<html>Существует {0} дополнительных точек используемых треком {1} <br>, "
-"которые удалены на сервере. <br><br> Вы хотите восстановить эти точки тоже?</"
-"html>"
+"Имеется {0} дополнительная точка, используемая в линии {1}<br>, которая "
+"удалена на сервере.<br><br>Вы хотите восстановить и эту точку тоже?"
 msgstr[1] ""
-"<html>Существует {0} дополнительных точек используемых треком {1} <br>, "
-"которые удалены на сервере. <br><br> Вы хотите восстановить эти точки тоже?</"
-"html>"
+"Имеется {0} дополнительные точки, используемых в линии {1}<br>, которые "
+"удалены на сервере.<br><br>Вы хотите восстановить и эти точки тоже?"
 msgstr[2] ""
-"<html>Существует {0} дополнительных точек используемых треком {1} <br>, "
-"которые удалены на сервере. <br><br> Вы хотите восстановить эти точки тоже?</"
-"html>"
+"Имеется {0} дополнительных точек, используемых в линии {1}<br>, которые "
+"удалены на сервере.<br><br>Вы хотите восстановить и эти точки тоже?"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
@@ -4889,5 +4939,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional primitive referred to by relation {1}<br>which is "
@@ -4897,15 +4947,12 @@
 "deleted on the server.<br><br>Do you want to undelete these too?"
 msgstr[0] ""
-"<html>Существуют дополнительные элементы ( {0} шт.), связанные с отношением "
-"{1}<br>, которые удалены с сервера. <br><br>Вы хотите восстановить их тоже?</"
-"html>"
+"Имеется {0} дополнительный элемент, входящий в отношение {1}<br>, который "
+"удалён на сервере.<br><br>Вы хотите восстановить и этот элемент тоже?"
 msgstr[1] ""
-"<html>Существуют дополнительные элементы ( {0} шт.), связанные с отношением "
-"{1}<br>, которые удалены с сервера. <br><br>Вы хотите восстановить их тоже?</"
-"html>"
+"Имеется {0} дополнительных элемента, входящие в отношение {1}<br>, которые "
+"удалены на сервере.<br><br>Вы хотите восстановить и эти элементы тоже?"
 msgstr[2] ""
-"<html>Существуют дополнительные элементы ( {0} шт.), связанные с отношением "
-"{1}<br>, которые удалены с сервера. <br><br>Вы хотите восстановить их тоже?</"
-"html>"
+"Имеется {0} дополнительных элементов, входящих в отношение {1}<br>, которые "
+"удалены на сервере.<br><br>Вы хотите восстановить и эти элементы тоже?"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
@@ -5008,5 +5055,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr "Нет, прервать"
@@ -5057,5 +5104,11 @@
 msgstr "Элемент"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+"Элемент {0} не может быть добавлен к отношению, потому что он был удалён."
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -5189,10 +5242,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "ничего"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "все"
@@ -5273,7 +5326,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -5284,6 +5337,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5486,10 +5539,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5509,13 +5562,13 @@
 msgstr "Стек команд: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr "Устранить конфликты."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Устранить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
@@ -5523,6 +5576,6 @@
 "объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5551,11 +5604,12 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216
-#, java-format
+#, fuzzy, java-format
 msgid ""
 "<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions won't be applied unless all differences<br>are "
-"resolved.Click <strong>{0}</strong> to close anyway."
-"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<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>Улаживание "
@@ -5584,5 +5638,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5591,5 +5645,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5669,43 +5723,48 @@
 msgstr "Показать историю выделенных объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Слои"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 msgid "Open a list of all loaded layers."
 msgstr "Показать список всех загруженных слоёв."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr "Удалить выбранные слои."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Показать/скрыть"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr "Включить"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr "Активировать выделенный слой"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr "Объединить этот слой с другим слоем"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Дублировать линию"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 msgid "Move the selected layer one row up."
 msgstr "Переместить выделенный слой вверх."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Переместить выделенный слой вниз."
@@ -5719,6 +5778,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Отношения"
@@ -5728,69 +5787,69 @@
 msgstr "Показать список всех отношений."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "Отношения: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Открыть редактор для выбранного отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Удалить выбранное отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Создать новое отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Создать копию этого отношения и открыть его в другом окне редактора"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr "Установить текущий выбор на списке выделенных отношений"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr "Выделите участников всех выбранных отношений"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr "Выбрать участников"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr "Скачать с сервера всех участников выделенных отношений"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr "Скачать участников"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Текущее выделение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Показать окно со списком выделенных объектов."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Приблизиться к выделенным элементам"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Приблизиться к выделенному"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Яч.: Связ.:{0} / Линий:{1} / Точек:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5798,5 +5857,5 @@
 msgstr "Выделение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -6164,8 +6223,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -6237,4 +6294,7 @@
 #. <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 />
@@ -6313,6 +6373,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6354,6 +6415,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6822,152 +6885,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Название"
@@ -6983,5 +7048,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:143
 msgid "Open/Closed:"
-msgstr "Открыть/Закрыто:"
+msgstr "Открыто/Закрыто:"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:155
@@ -7221,4 +7286,6 @@
 "changeset query to a specific bounding box.</html>"
 msgstr ""
+"<html>Пожалуйста, введите правильные значения долготы/широты, чтобы "
+"ограничить<br>запрос пакета правок к конкретной рамке охвата.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:954
@@ -7228,19 +7295,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
-#, fuzzy
 msgid ""
 "The current value is not a valid user ID. Please enter an integer value > 0"
 msgstr ""
-"Текущее значение не является правильным номером пакета правок. Введите целое "
-"число > 0"
+"Текущее значение это неверный ID пользователя. Пожалуйста введите целое "
+"значение > 0"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
-#, fuzzy
 msgid ""
 "<html>The  current value is not a valid user name.<br>Please enter an non-"
 "empty user name.</html>"
 msgstr ""
-"Текущее значение не является правильным номером пакета правок. Введите целое "
-"число > 0"
+"<html>Текущее значение это неверное имя пользователя.<br>Пожалуйста введите "
+"непустое имя пользователя.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1033
@@ -7254,4 +7319,6 @@
 "<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:1133
@@ -7261,4 +7328,6 @@
 "{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
@@ -7271,4 +7340,6 @@
 "include all changesets in the query.</html>"
 msgstr ""
+"<html>Отметьте для запроса только к вашему пакету правок.<br>Снимите "
+"отметку, чтобы включить в запрос все пакеты правок.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:193
@@ -7278,4 +7349,6 @@
 "default query."
 msgstr ""
+"Предупреждение: неожиданное значение для настройки ''{0}'', получено "
+"''{1}''. Сброс к запросу по умолчанию."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:51
@@ -7346,4 +7419,6 @@
 msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
 msgstr ""
+"Пожалуйста, введите или вставьте URL для извлечения пакетов правок из OSM "
+"API."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
@@ -7357,4 +7432,7 @@
 "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
@@ -7372,5 +7450,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:183
 msgid "An empty value deletes the tag."
-msgstr "Пустое значение удаляет тег."
+msgstr "Пустое значение удаляет тег"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:224
@@ -7378,5 +7456,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<различные>"
@@ -7433,55 +7511,55 @@
 msgstr "Добавить параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Свойств: {0} / Участников: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Параметры / Участники"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Изменить отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "Удалить из отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Вы действительно хотите удалить отмеченное из отношения {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Удалить выделенный ключ из всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "Удалить параметры"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Добавить новую пару ключ/значение для всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Изменить значение выбранного ключа для всех объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr "Выбрать отношение"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr "Выберите отношение в основном выборе."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr "Выбрать в списке отношений"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr "Выбрать отношение в списке отношений."
@@ -7519,10 +7597,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1093
-#, fuzzy
 msgid "Conflict in data"
 msgid_plural "Conflicts in data"
 msgstr[0] "Конфликт в данных"
-msgstr[1] "Конфликт в данных"
-msgstr[2] "Конфликт в данных"
+msgstr[1] "Конфликта в данных"
+msgstr[2] "Конфликтов в данных"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:345
@@ -7837,16 +7914,15 @@
 msgid "You are setting an empty role on {0} primitive."
 msgid_plural "You are setting an empty role on {0} primitives."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "Вы назначили пустую роль на {0} элемент."
+msgstr[1] "Вы назначили пустую роль на {0} элемента."
+msgstr[2] "Вы назначили пустую роль на {0} элементов."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
 msgid "This is equal to deleting the roles of these primitives."
-msgstr ""
+msgstr "Это эквивалентно удалению ролей из этих элементов."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
-#, fuzzy
 msgid "Do you really want to apply the new role?"
-msgstr "Вы действительно хотите удалить слой ''{0}''?"
+msgstr "Вы действительно хотите назначить новую роль?"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
@@ -7943,10 +8019,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-#, fuzzy, java-format
+#, 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:72
@@ -7967,31 +8043,31 @@
 "линия не соединена ни с предыдущим, ни со следующим участником отношения"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Закладки"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../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:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+#, fuzzy
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
 msgstr ""
 "<html><strong>Текущая область для скачивания с сервера</strong> (minlat,"
 "minlon, maxlat, maxlon): {0}, {1}, {2}, {3}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr "Создать закладку"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../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:187
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:192
 msgid ""
 "Currently, there is no download area selected. Please select an area first."
@@ -8000,20 +8076,20 @@
 "её."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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:212
+#: ../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:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr "Переименовать выделенные закладки"
@@ -8143,18 +8219,18 @@
 "данные GPX, или и то и другое.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+msgstr "Тип класса"
+
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr "Границы"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr "Возле"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -8165,34 +8241,34 @@
 msgstr "Выберите поисковой сервер:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../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:111
+#: ../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:147
+#: ../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:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Пустой указатель исключение, возможно есть отсутствующие теги"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr "Найти ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr "Нажмите, чтобы начать поиск мест"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr "Запрос на сервер имён"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr "Запрос на сервер имён ..."
@@ -8203,7 +8279,9 @@
 #. 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" />
@@ -8212,10 +8290,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Тип"
@@ -8224,5 +8303,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -8234,17 +8313,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "неизвестный"
@@ -8380,8 +8458,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511
-#, fuzzy, java-format
+#, java-format
 msgid "Warning: bad location in HTML document. Exception was: {0}"
 msgstr ""
-"Предупреждение: плохое расположение в документе HTML. Исключение было: "
+"Предупреждение: плохое расположение в документе HTML. Исключение было: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561
@@ -8574,4 +8652,6 @@
 "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
@@ -8581,4 +8661,6 @@
 "include such a primitive"
 msgstr ""
+"Не удалось обновить элемент с id {0}, потому что текущий слой редактирования "
+"не содержит такого элемента"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:94
@@ -8624,5 +8706,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr "Обнаружены конфликты"
@@ -8799,12 +8881,14 @@
 "exception."
 msgstr ""
+"Предупреждение: не удается держать диалог учетных данных всегда поверх окон. "
+"Это сделано по соображениям безопасности."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105
 msgid "Enter credentials for OSM API"
-msgstr ""
+msgstr "Введите учётные данные для OSM API"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:112
 msgid "Enter credentials for HTTP proxy"
-msgstr ""
+msgstr "Введите учетные данные для прокси HTTP"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:145
@@ -8821,11 +8905,11 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Authenticating at the OSM API ''{0}'' failed. Please enter a valid username "
 "and a valid password."
 msgstr ""
-"<html><Авторизация на сервере OSM с именем пользователя ''{0}'' неудалась. "
-"<br> Проверьте имя пользователя и пароль в настройках JOSM. </html>"
+"Идентификация OSM API ''{0}'' не удалась. Пожалуйста введите правильное имя "
+"пользователя и правильный пароль."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242
@@ -8836,10 +8920,11 @@
 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 "Пожалуйста, введите пароль для аутентификации на вашем прокси-сервере"
+msgstr ""
+"Пожалуйста, введите пароль для идентификация личности на вашем прокси-сервере"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257
@@ -8849,4 +8934,6 @@
 "username and a valid password."
 msgstr ""
+"Идентификация на прокси HTTP ''{0}'' не удалась. Пожалуйста введите "
+"правильное имя пользователя и правильный пароль."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259
@@ -8855,16 +8942,18 @@
 "password may be transferred unencrypted."
 msgstr ""
+"Предупреждение: в зависимости от метода идентификации, пароль, который "
+"использует прокси сервер, может быть передан в незашифрованном виде."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279
 msgid "Authenticate"
-msgstr "Аутентификация"
+msgstr "Идентификация личности"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:280
 msgid "Authenticate with the supplied username and password"
-msgstr "Аутентифицировать с данными именем пользователя и паролем"
+msgstr "Идентификация личности с данными именем пользователя и паролем"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:293
 msgid "Cancel authentication"
-msgstr "Отменить аутентификацию"
+msgstr "Отменить идентификацию личности"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:63
@@ -8875,4 +8964,7 @@
 "working."
 msgstr ""
+"Невозможно получить список ваших открытых пакетов правок, потому что<br>JOSM "
+"не идентифицировал вас.<br>Либо вы работатаете анонимно, либо вам не "
+"позволено<br>идентифицировать пользователя, от имени которого вы работаете."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:68
@@ -8886,4 +8978,6 @@
 "was: {0}"
 msgstr ""
+"Предупреждение: Не удалось получить данные о текущем пользователе JOSM. "
+"Исключения были: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
@@ -9026,5 +9120,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>{0} layer needs saving but has an associated file<br>which cannot be "
@@ -9036,15 +9130,15 @@
 "changes.<br>Layers with non-writable files:</html>"
 msgstr[0] ""
-"<html>{0} слой, необходимо сохранить в соответствующий файл,<br> но это не "
-"удаётся сделать.<br>Либо выберите другой файл для этого слоя, либо отмените "
-"изменения.<br>Слой, который не удаётся записать в файл:</html>"
+"<html>{0} слой требуется сохранить, но открытый файл<br>не удаётся сохранить."
+"<br>Либо выберите другой файл для этого слоя, либо отмените изменения."
+"<br>Слой с незаписываемым файлом:</html>"
 msgstr[1] ""
-"<html>{0} слоя, необходимо сохранить в соответствующие файлы,<br> но это не "
-"удаётся сделать.<br>выберите другие файлы для каждого из этих слоёв, либо "
-"отмените изменения.<br>Слои, которые не удаётся записать в файлы:</html>"
+"<html>{0} слоя требуется сохранить, но открытые файлы<br>не удаётся "
+"сохранить.<br>Либо выберите другие файлы для этих слоёв, либо отмените "
+"изменения.<br>Слои с незаписываемыми файлами:</html>"
 msgstr[2] ""
-"<html>{0} слоёв, необходимо сохранить в соответствующий файл,<br> но это не "
-"удаётся сделать.<br>выберите другие файлы для каждого из этих слоёв, либо "
-"отмените изменения.<br>Слои, которые не удаётся записать в файл:</html>"
+"<html>{0} слоёв требуется сохранить, но открытые файлы<br>не удаётся "
+"сохранить.<br>Либо выберите другие файлы для этих слоёв, либо отмените "
+"изменения.<br>Слои с незаписываемыми файлами:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
@@ -9097,5 +9191,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -9106,11 +9200,11 @@
 msgstr[0] ""
 "<html>Операция передачи на сервер и/или сохранения одного слоя с "
-"правками<br>было отменено или не удалось.</html>"
+"правками<br>была отменена или не удалась.</html>"
 msgstr[1] ""
-"<html>Операция передачи на сервер и/или сохранения одного слоя с "
-"правками<br>было отменено или не удалось.</html>"
+"<html>Операция передачи на сервер и/или сохранения {0} слоёв с "
+"правками<br>была отменена или не удалась.</html>"
 msgstr[2] ""
-"<html>Операция передачи на сервер и/или сохранения одного слоя с "
-"правками<br>было отменено или не удалось.</html>"
+"<html>Операция передачи на сервер и/или сохранения {0} слоёв с "
+"правками<br>была отменена или не удалась.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500
@@ -9133,9 +9227,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -9145,7 +9239,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -9157,16 +9251,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "Слой"
@@ -9299,4 +9393,6 @@
 "comment ''{1}''."
 msgstr ""
+"Объекты переданы на сервер <strong>в открытый пакет правок</strong> {0} с "
+"комментарием ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:54
@@ -9369,4 +9465,7 @@
 "proceed with <strong>multiple changesets</strong>"
 msgstr ""
+"{0} объектов превысили макс. позволенное {1} объектов в пакете правок на "
+"сервере ''{2}''. Пожалуйста, <a href=\"urn:advanced-configuration\">укажите</"
+"a> каким образом продолжить с <strong>несколькими пакетами правок</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:100
@@ -9376,4 +9475,6 @@
 "strong> using <strong>{1} requests</strong>"
 msgstr ""
+"Передача на сервер <strong>{0} объектов</strong> в <strong>несколько пакетов "
+"правок</strong>, используя запросы <strong>{1}</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:66
@@ -9416,4 +9517,7 @@
 "on the server ''{1}''."
 msgstr ""
+"Сервер сообщил, что текущий пакет правок был закрыт.<br>Скорее всего это "
+"произошло потому, что размер пакета правок превысил макс. размер <br>({0} "
+"объектов) на сервере ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:106
@@ -9433,4 +9537,8 @@
 "editing.<br>"
 msgstr ""
+"Нажмите ''<strong>{0}</strong>'' чтобы продолжить передачу на сервер в "
+"дополнительные пакеты правок.<br>Нажмите ''<strong>{1}</strong>'', чтобы "
+"вернуться к диалогу передачи на сервер.<br>Нажмите ''<strong>{2}</strong>'', "
+"чтобы отменить передачу на сервер и вернуться к редактированию карты.<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:123
@@ -9496,5 +9604,5 @@
 msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
 msgstr ""
-"Предупреждение: неожиданное значение ключа ''{0}'' в параметрах, получено "
+"Предупреждение: неожиданное значение ключа ''{0}'' в настройках, получено "
 "''{1}''"
 
@@ -9522,4 +9630,6 @@
 "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
@@ -9541,4 +9651,7 @@
 "size {1} on server ''{2}'' is exceeded.</html>"
 msgstr ""
+"<html>Невозможно загрузить на сервер объекты в количестве {0} штук за один "
+"запрос, потому что<br>превышен макс. размер пакета правок {1} на сервере "
+"''{2}''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
@@ -9548,4 +9661,6 @@
 "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
@@ -9625,68 +9740,68 @@
 msgstr[2] "Удалить {0} объектов:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "точка GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Настроить отрисовку линий"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Use global settings."
 msgstr "Использовать глобальные настройки."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Выбрать цвет"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "По умолчанию"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Выбор цвета"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr "Маркеры из именованых точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Именованные точки трека из {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Импортировать аудиофайлы"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9699,23 +9814,23 @@
 "аудиоданными.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr "Импорт невозможен"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Аудиофайлы Wave (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Аудиомаркеры из {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Импорт изображений"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9728,5 +9843,5 @@
 "изображениями.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9734,5 +9849,5 @@
 msgstr "Название: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9740,5 +9855,5 @@
 msgstr "Описание: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9749,23 +9864,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "Описание"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr "Период"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr "Длина"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Длина: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9775,5 +9890,5 @@
 msgstr[2] "{0} маршрутов, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9783,10 +9898,10 @@
 msgstr[2] "{0} путевых точек"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Преобразовать в слой данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9796,43 +9911,43 @@
 "считается вредоносной.<br>Если хотите загрузить треки, ознакомьтесь с этим:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Преобразовано из: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "Скачать с OSM данные вдоль этого трека"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Скачать всё в пределах:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} метров"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "Максимальная область для одного запроса:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} кв. км."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9843,9 +9958,9 @@
 "Продолжить?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 msgid "No GPX track available in layer to associate audio with."
 msgstr "На слое отсутствует трек GPX, чтобы наложить звук."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9855,5 +9970,5 @@
 "будут пропущены или перенесены в начало трека."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9863,24 +9978,24 @@
 "проигнорированы при рассчете времени."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Слой данных {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "вне области для скачивания"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr "версия {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 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:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9890,5 +10005,5 @@
 msgstr[2] "Обнаружено {0} конфликтов."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9912,5 +10027,5 @@
 "удалёны на сервере."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9930,11 +10045,11 @@
 "конфликтов и устраните конфликты вручную."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr "Нажмите, чтобы закрыть этот диалог и продолжить правку"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9944,32 +10059,32 @@
 msgstr[2] "{0} удалено"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} состоит из:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr "отключено"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr "Версия API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Преобразовать в слой GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr "Тест согласованности набора данных"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr "Проблемы не обнаружены"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr "Обнаружены следующие проблемы:"
@@ -10024,28 +10139,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "Точки GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr "точка GPS"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Файлы GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "Файл {0} загружен под именем \"{1}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Ошибка разбора {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Невозможно прочитать \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -10057,34 +10171,34 @@
 "прочитаете на фото и выберите часовой пояс <hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr "Время фотоснимка (из EXIF):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 msgid "Gps time (read from the above photo): "
 msgstr "Время GPS (прочтите на фото вверху): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [дд/мм/гггг чч:мм:сс]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr "Я нахожусь в часовом поясе: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "Без даты"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr "Открыть другое фото"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "Синхронизировать время по фотографии из GPS-приемника"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -10094,113 +10208,115 @@
 "Пожалуйста, используйте запрашиваемый формат"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "Недопустимая дата"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr "<Не загружены треки GPX>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr "Трек GPX: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr "Открыть другой трек GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+"<html>Использовать фотографию цифровых часов,<br>например, как на дисплее "
+"приёмника GPS</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr "Ручная регулировка"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr "Переустановить позицию для: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+msgstr "Изображения с координатами местоположения в данных exif ({0}/{1})"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr "Помечено изображений ({0}/{1})"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+msgstr "Показать эскиз изображения на карте"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr "Часовой пояс: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr "Смещение:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr "Нет выбранных gpx"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, 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] ""
-msgstr[1] ""
-msgstr[2] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+msgstr[0] "<html><b>{0}</b> из <b>{1}</b> фото соответствует треку GPX.</html>"
+msgstr[1] "<html><b>{0}</b> из <b>{1}</b> фото соответствует треку GPX.</html>"
+msgstr[2] "<html><b>{0}</b> из <b>{1}</b> фото соответствует треку GPX.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr "Сопоставить изображения с GPX треком"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr "Совпадения"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr "Недопустимый часовой пояс"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr "Недопустимое смещение"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr "Попытаться снова"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr "Нет соответствующих изображений!"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Часовой пояс: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Минуты: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Секунды: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -10210,5 +10326,5 @@
 msgstr[2] "(Расхождение во времени {0} дней)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -10218,21 +10334,21 @@
 "можете вручную совместить фотографии с помощью движков."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr "Сопоставление фотографий треку прервано"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr "Настройка часового пояса и смещения"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 msgid "The selected photos do not contain time information."
 msgstr "Выбранные фотографии не содержат информацию о времени."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr "Фотографии не содержат информацию о времени"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10241,17 +10357,17 @@
 "Точки в выбранном GPX треке не содержат времени. Пожалуйста, выберите другой."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr "GPX трек не содержит информации о времени"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr "Необходимо выбрать трек GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr "Трек GPX не выделен"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -10262,5 +10378,5 @@
 "Ожидаемый формат: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -10271,77 +10387,77 @@
 "Ожидаемый формат: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "Извлечение GPS координат из EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr "Запуск сканирования каталога"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr "Один из выделенных файлов пуст"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "Прочитать фотографии..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Чтение {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, 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:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Скнирование каталога {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Найден пустой файл в каталоге {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Ошибка чтения файлов в каталоге {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Изображения с данными о местоположении"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr "Коррелируют с GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "{0} точки \"via\" (через)."
-msgstr[1] "{0} точки \"via\" (через)."
-msgstr[2] "{0} точки \"via\" (через)."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
-#, fuzzy, java-format
+msgstr[0] "Загружено {0} изображение."
+msgstr[1] "Загружено {0} изображения."
+msgstr[2] "Загружено {0} изображений."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
+#, java-format
 msgid "{0} was found to be GPS tagged."
 msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] "{0} изображений имело теги GPS"
-msgstr[1] "{0} изображений имело теги GPS"
-msgstr[2] "{0} изображений имело теги GPS"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+msgstr[0] "{0} найден, помеченным GPS."
+msgstr[1] "{0} найдено, помеченным GPS."
+msgstr[2] "{0} найдено, помеченным GPS."
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr "Удалить изображение с диска"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -10352,5 +10468,5 @@
 "утерян!</h3></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr "Невозможно удалить файл изображения."
@@ -10447,5 +10563,5 @@
 msgstr "маркер GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10454,5 +10570,5 @@
 msgstr[2] "маркеров"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10462,9 +10578,9 @@
 msgstr[2] "{0} состоит из {1} маркеров"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "Синхронизировать аудио"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10473,20 +10589,20 @@
 "синхронизации."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../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:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr "Установить маркер аудио на позиции проигрывания"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -10496,17 +10612,17 @@
 "маркер."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 msgid "No existing audio markers in this layer to offset from."
 msgstr "Нет существующих аудио маркеров на этом слое"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Показать/скрыть текст/значки"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 msgid "Toggle visible state of the marker text and icons."
 msgstr "Показать/скрыть текст и значки маркеров."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
+#: ../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 "
@@ -10516,5 +10632,5 @@
 "которым связана звуковая дорожка (после первого маркера)."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -10524,5 +10640,5 @@
 "маркер или на точку трека, где вы хотите синхронизировать."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "Невозможно создать новый аудио-маркер."
@@ -10542,23 +10658,27 @@
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:130
 msgid "Illegal dash pattern, values must be positive"
-msgstr ""
+msgstr "Неверный рисунок прерывистой линии, значение должно быть положительным"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/LineElemStyle.java:136
 msgid "Illegal dash pattern, at least one value must be > 0"
 msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
-#, fuzzy, java-format
+"Неверный рисунок прерывистой линии, по крайней мере, одно значение должно "
+"быть > 0"
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
+#, java-format
 msgid ""
 "Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
 msgstr ""
-"Предупреждение: не удалось прочитать MOTD из ''{0}''. Исключение было: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
-#, fuzzy, java-format
+"Предупреждение: не удалось загрузить стили Mappaint из ''{0}''. Исключение "
+"было: {1}"
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
+#, java-format
 msgid ""
 "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
 msgstr ""
-"Предупреждение: не удалось прочитать MOTD из ''{0}''. Исключение было: {1}"
+"Предупреждение: разборка стилей Mappaint из ''{0}'' не удалась. Исключение "
+"было: {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
@@ -10572,5 +10692,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:245
 msgid "Access Token Secret:"
-msgstr "Секрет маркера доступа:"
+msgstr "Крипто-ключ маркера доступа:"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:60
@@ -10592,9 +10712,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56
 msgid "Consumer Key:"
-msgstr "OAuth ключ"
+msgstr "Ключ потребителя"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:67
 msgid "Consumer Secret:"
-msgstr "OAuth крипто-ключ"
+msgstr "Крипто-ключ потребителя"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:78
@@ -10608,5 +10728,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#| msgid "Authorise URL:"
 msgid "Authorize URL:"
 msgstr "URL авторизации:"
@@ -10651,4 +10770,8 @@
 "html>"
 msgstr ""
+"<html>Запустить автоматическую процедуру получения маркера доступа с "
+"вебсайта OSM.<br>JOSM обратится к вебсайту OSM от имени пользователя JOSM, "
+"полностью<br>автоматически авторизует пользователя и получит маркер доступа."
+"</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:80
@@ -10660,4 +10783,9 @@
 "submitted by JOSM.</html>"
 msgstr ""
+"<html>Запустить полуавтоматическую процедуру получения маркера доступа с "
+"вебсайта OSM.<br>При этом JOSM подпишет стандарты запросов OAuth, чтобы "
+"получить маркер запроса и<br>маркер доступа. Пользователь будет отправлен на "
+"вебсайт OSM с помощью внешнего браузера<br>чтобы идентифицироваться и "
+"принять маркер запроса, подписанный JOSM.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:88
@@ -10685,5 +10813,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:176
 msgid "Advanced OAuth properties"
-msgstr "Продвинутые свойства OAuth"
+msgstr "Расширенные свойства OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:236
@@ -10699,8 +10827,10 @@
 "in subsequent requests to gain access to the OSM API.</html>"
 msgstr ""
+"<html>Вы успешно получили маркер доступа OAuth с вебсайта OSM. Нажмите на "
+"<strong>{0}</strong> чтобы подтвердить маркер. JOSM будет использовать его в "
+"последующих запросах к OSM API.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#| msgid "Authorise now"
 msgid "Authorize now"
 msgstr "Авторизоваться"
@@ -10708,5 +10838,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
 msgid "Click to redirect you to the authorization form on the JOSM web site"
-msgstr ""
+msgstr "Нажмите, чтобы вызвать бланк авторизации на вебсайте JOSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:365
@@ -10716,5 +10846,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:366
-#| msgid "Run the automatic authorisation steps again"
 msgid "Run the automatic authorization steps again"
 msgstr "Запустить процедуру автоматической авторизации ещё раз"
@@ -10731,5 +10860,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:24
 msgid "Please enter your OSM user name"
-msgstr "Пожалуйста введите Ваше имя пользователя в OSM"
+msgstr "Пожалуйста, введите ваше имя пользователя в OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:411
@@ -10744,5 +10873,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:73
 msgid "Please enter your OSM password"
-msgstr "Пожалуйста введите Ваш OSM-пароль"
+msgstr "Пожалуйста, введите ваш OSM-пароль"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:432
@@ -10752,12 +10881,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:442
 msgid "Authorize JOSM to access the OSM API"
-msgstr ""
+msgstr "Авторизовать JOSM для получения доступа к OSM API"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:456
-#| 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 "
-#| "authorisation process,<br>i.e. semi-automatic or manual authorisation.</"
-#| "html>"
 msgid ""
 "<html>The automatic process for retrieving an OAuth Access Token<br>from the "
@@ -10773,10 +10897,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
-#| msgid "OAuth authorisation failed"
 msgid "OAuth authorization failed"
 msgstr "Авторизация OAuth не удалась"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>The automatic process for retrieving an OAuth Access Token<br>from the "
@@ -10785,4 +10908,16 @@
 "advanced setting and try again.</html>"
 msgstr ""
+"<html>Автоматический процесс извлечения маркера доступа OAuth <br>с сервера "
+"OSM не удался, потому что JOSM не смог построить<br>верную URL входа из URL "
+"OAuth Authorize Endpoint ''{0}''.<br><br>Пожалуйста, проверьте ваши "
+"расширенные настройки и попытайтесь ещё раз.</html>"
+
+#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:496
+#, java-format
+msgid ""
+"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
+"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
+"<br><br>Please check username and password and try again.</html>"
+msgstr ""
 "<html>Автоматический процесс получения маркера доступа OAuth<br>с сервера "
 "OSM не удался. JOSM отверг вход в {0}<br>для пользователя {1}."
@@ -10790,21 +10925,6 @@
 "раз.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:496
-#, java-format
-msgid ""
-"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
-"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
-"<br><br>Please check username and password and try again.</html>"
-msgstr ""
-"<html>Автоматический процесс получения маркера доступа OAuth<br>с сервера "
-"OSM не удался. JOSM отверг вход в {0}<br>для пользователя {1}."
-"<br><br>Пожалуйста, проверьте имя пользователя и пароль и попытайтесь ещё "
-"раз.</html>"
-
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:58
 #, java-format
-#| msgid ""
-#| "Please enter an OAuth Access Token which is authorised to access the OSM "
-#| "server ''{0}''."
 msgid ""
 "Please enter an OAuth Access Token which is authorized to access the OSM "
@@ -10820,5 +10940,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:118
 msgid "Access Token"
-msgstr "Маркер Доступа"
+msgstr "Маркер доступа"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:119
@@ -10836,7 +10956,4 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:139
 #, java-format
-#| msgid ""
-#| "<html><body>Please enter an OAuth Access Token which is authorised to "
-#| "access the OSM server ''{0}''.</body></html>"
 msgid ""
 "<html><body>Please enter an OAuth Access Token which is authorized to access "
@@ -10848,5 +10965,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:177
 msgid "Please enter an Access Token Key"
-msgstr "Пожалуйста введите Ключ Маркера Доступа"
+msgstr "Пожалуйста введите ключ маркера доступа"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:179
@@ -10854,10 +10971,10 @@
 "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 "Пожалуйста, введите секрет маркера доступа"
+msgstr "Пожалуйста, введите крипто-ключ маркера доступа"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:199
@@ -10866,6 +10983,6 @@
 "Secret"
 msgstr ""
-"Секрет маркера доступа не должен быть пустым. Пожалуйста, введите секрет "
-"маркера доступа"
+"Крипто-ключ маркера доступа не должен быть пустым. Пожалуйста, введите "
+"крипто-ключ маркера доступа"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:233
@@ -10875,5 +10992,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#| msgid "Please select an authorisation procedure: "
 msgid "Please select an authorization procedure: "
 msgstr "Пожалуйста выбирите способ авторизации: "
@@ -10885,5 +11001,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
-#| msgid "Close the dialog and cancel authorisation"
 msgid "Close the dialog and cancel authorization"
 msgstr "Закрыть диалог и отменить авторизацию"
@@ -10912,5 +11027,5 @@
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
-msgstr ""
+msgstr "Вебсайт OSM кукис сессии в ответе на ''{0}'',"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:350
@@ -10918,38 +11033,35 @@
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
-"Сбой аутентификации пользователя ''{0}'' с паролем ''***'' в качестве "
-"пользователя OAuth"
+"Сбой идентификации личности пользователя ''{0}'' с паролем ''***'' как "
+"пользователя с OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:437
 #, java-format
-#| msgid "Failed to authorise OAuth request  ''{0}''"
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr "Не удалось выполнить запрос OAuth-авторизации ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:484
-#, fuzzy, java-format
-#| msgid "Retrieving OAuth Request Token from ''{0}''"
+#, java-format
 msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr "Восстановление маркера запроса OAuth от ''{0}''"
+msgstr "Авторизация маркера запроса OAuth ''{0}'' на вебсайте OSM..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:486
 msgid "Initializing a session at the OSM website..."
-msgstr ""
+msgstr "Инициализация сеанса на веб-сайте OSM..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:492
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
-msgstr ""
+msgstr "Сеанс аутентификации личности для пользователя ''{0}''..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498
-#, fuzzy, java-format
-#| msgid "Retrieving OAuth Request Token from ''{0}''"
+#, java-format
 msgid "Authorizing request token ''{0}''..."
-msgstr "Восстановление маркера запроса OAuth от ''{0}''"
+msgstr "Авторизация маркера запроса ''{0}''..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:504
 #, java-format
 msgid "Logging out session ''{0}''..."
-msgstr ""
+msgstr "Завершение сеанса ''{0}''..."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:37
@@ -10960,4 +11072,6 @@
 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
@@ -10968,4 +11082,5 @@
 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
@@ -10978,53 +11093,55 @@
 "layers"
 msgstr ""
+"Выберите, чтобы позволить JOSM скачивать с сервера ваши личные треки GPS в "
+"слои JOSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
 msgid "Allow to read your preferences"
-msgstr "Разрешить просмотр своих параметров"
+msgstr "Разрешить просмотр своих настроек"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
 msgid "Select to grant JOSM the right to read your server preferences"
-msgstr ""
+msgstr "Выберите, чтобы позволить JOSM читать ваши настройки сервера"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
 msgid "Allow to write your preferences"
-msgstr "Разрешить запись своих параметров"
+msgstr "Разрешить запись своих настроек"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
 msgid "Select to grant JOSM the right to write your server preferences"
-msgstr ""
+msgstr "Выберите, чтобы позволить JOSM записывать ваши настройки сервера"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
 msgid "Retrieving OAuth Access Token..."
-msgstr ""
+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 ""
+msgstr "<html>Не удалось получить маркер доступа OAuth от ''{0}''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:73
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:67
 msgid "Request Failed"
-msgstr ""
+msgstr "Запрос не удался"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java:41
 msgid "Retrieving OAuth Request Token..."
-msgstr ""
+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 ""
+msgstr "<html>Не удалось получить маркер запроса OAuth от ''{0}''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:130
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:82
 msgid "Display Advanced OAuth Parameters"
-msgstr ""
+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 ""
+msgstr "Извлечь маркер запроса"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:163
@@ -11034,12 +11151,14 @@
 "Token from ''{1}''.</html>"
 msgstr ""
+"<html>Пожалуйста, нажмите на <strong>{0}</strong>, чтобы извлечь маркер "
+"запроса OAuth из ''{1}''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:182
 msgid "<html>Step 1/3: Retrieve an OAuth Request Token</html>"
-msgstr ""
+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 ""
+msgstr "<html>Шаг 2/3: Авторизоваться и извлечь маркер доступа</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:228
@@ -11058,13 +11177,20 @@
 "</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 ""
+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 ""
+msgstr "<html>Шаг 3/3: Маркер доступа успешно извлечён</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:306
@@ -11074,4 +11200,7 @@
 "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
@@ -11081,13 +11210,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:371
 msgid "Click to retrieve a Request Token"
-msgstr ""
+msgstr "Нажмите, чтобы извлечь маркер запроса"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:402
 msgid "Retrieve Access Token"
-msgstr ""
+msgstr "Извлечь маркер доступа"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:404
 msgid "Click to retrieve an Access Token"
-msgstr ""
+msgstr "Нажать, чтобы извлечь маркер доступа"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:59
@@ -11099,9 +11228,13 @@
 msgid "Retrieving user details with Access Token Key ''{0}'' was rejected."
 msgstr ""
+"Извлечение данных пользователя с ключом маркера доступа ''{0}'' было "
+"отклонено."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:120
-#, fuzzy, java-format
+#, java-format
 msgid "Retrieving user details with Access Token Key ''{0}'' was forbidden."
-msgstr "Восстановление маркера доступа OAuth от ''{0}''"
+msgstr ""
+"Получение информации о пользователе с ключом маркера доступа ''{0}'' было "
+"запрещено."
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
@@ -11112,4 +11245,7 @@
 "''{3}''.</html>"
 msgstr ""
+"<html>Маркер доступа ''{0}'' успешно использован для<br>доступа к серверу "
+"OSM ''{1}''.<br>Вы теперь имеете доступ к серверу OSM в качестве "
+"пользователя ''{2}'' с id ''{3}''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154
@@ -11125,4 +11261,8 @@
 "token.</html>"
 msgstr ""
+"<html>Не удалось получить доступ к серверу OSM ''{0}''<br>с помощью маркера "
+"доступа ''{0}''.<br>Сервер отверг маркер доступа, как неавторизованный. Вы "
+"не сможете<br>получить доступ к любым защищённым ресурсам на этом сервере с "
+"данным маркером доступа.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172
@@ -11142,4 +11282,9 @@
 "resources.</html>"
 msgstr ""
+"<html>Маркер доступа ''{1}'' известен серверу OSM ''{0}''.<br>Однако, тест "
+"получения данных пользователя этого маркера не удался.<br>Независимо от "
+"того, какими правами наделён этот маркер, вы, тем не менее, можете "
+"использовать его<br>для передачи данных и GPS треков на сервер, а также для "
+"доступа к другим защищённым ресурсам.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190
@@ -11155,4 +11300,8 @@
 "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
@@ -11162,7 +11311,8 @@
 "''{1}''.<br>The token ist probably invalid.</html>"
 msgstr ""
+"<html>Не удалось подписать запрос к OSM серверу ''{0}'' с помощью маркера "
+"''{1}''.<br>Возможно, что список маркеров испорчен.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
-#, fuzzy
 msgid ""
 "<html>The test failed because the server responded with an internal error."
@@ -11170,6 +11320,7 @@
 "</html>"
 msgstr ""
-"<html>Сервер OSM<br>''{0}''<br>сообщил о внутренней ошибке.<br>Похоже, это "
-"временная проблема. Пожалуйста, попробуйте позднее.</html>"
+"<html>Тест не прошёл, потому что сервер сообщил о внутренней ошибке.<br>JOSM "
+"не смог определить достоверность маркера. Пожалуйста, попытайтесь позже.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
@@ -11179,5 +11330,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49
 msgid "Advanced Preferences"
-msgstr "Дополнительные параметры"
+msgstr "Расширенные настройки"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:50
@@ -11206,5 +11357,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Пожалуйста, выберите ряд для редактирования."
@@ -11218,5 +11369,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -11370,9 +11521,4 @@
 msgstr "Стиль рисования {0}:{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "Слой: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -11402,6 +11548,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr "Все"
@@ -11444,8 +11590,8 @@
 msgstr "Одним цветом (может быть определено для именованных слоёв)"
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Автомобиль"
@@ -11467,13 +11613,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Вело"
@@ -11506,12 +11652,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "Пешком"
@@ -11866,5 +12012,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
-#, fuzzy
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11880,15 +12025,17 @@
 "keyboard...</p>"
 msgstr ""
-"<p>Вы можете заметить, что в списке выбора клавиш на следующей вкладке есть "
-"все клавиши со всех типов клавиатур, известных Java, а не только те клавиши, "
-"что есть на Вашей клавиатуре. Пожалуйста, используйте только те значения, "
-"которые соответствуют клавишам, присутствующим на Вашей клавиатуре. Поэтому, "
-"если на ней нет клавиши 'Copy' (она есть только на клавиатурах от Sun), то "
-"не используйте её. Также в списке есть клавиши, соответствующие значению в "
-"верхнем регистре (например, ':'/двоеточие). Пожалуйста, не используйте их "
-"тоже. Используйте только основную клавишу(';'/точка с запятой для английской "
-"раскладки, либо '6' для русской). В противном случае могут возникать "
-"конфликты, так как в программе JOSM в английской раскладке Ctrl+Shift+; и "
-"Ctrl+: это одно и то же сочетание.</p>"
+"<p>Вы можете заметить, что список выбираемых клавиш на следующей странице "
+"содержит все клавиши, которые имеются на всех типах клавиатур известных "
+"Java, а не только те клавиши, которые есть на вашей клавиатуре. Пожалуйста, "
+"используйте только те значения, которые относятся к реально существующим "
+"клавишам на вашей клавиатуре. То есть, если на вашей клавиатуре нет клавиши "
+"''Copy'' (её нет на клавиатуре PC, но присутствует на клавиатуре Sun), не "
+"используйте её. Также имеются некоторые ''значения'', которые вызываются "
+"комбинацией клавиш (например '':'' - двоеточие). Пожалуйста, также не "
+"используйте их, используйте вместо них базовые клавиши (например '';'' - "
+"точку_с_запятаей на клавиатуре US, ''.'' - точку на клавиатуре German,...). "
+"Если вы не послушаетесь совета - могут возникнуть конфликты, так как нет "
+"способа указать JOSM, что Ctrl+Shift+; и Ctrl+: это одно и то же, на "
+"клавиатуре US...</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
@@ -11988,5 +12135,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:92
 msgid "Close the preferences dialog and discard preference updates"
-msgstr ""
+msgstr "Закрыть диалог настроек и отменить внесённые изменения"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109
@@ -12064,5 +12211,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:68
 msgid "Authentication"
-msgstr "Авторизация"
+msgstr "Идентификация личности"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:69
@@ -12076,5 +12223,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:71
 msgid "Configure your identity and how to authenticate at the OSM server"
-msgstr "Задать ваши данные и определить способ аутентификации на сервере OSM"
+msgstr ""
+"Задать ваши данные и определить способ идентификации личности на сервере OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:72
@@ -12240,4 +12388,6 @@
 "list of available plugins."
 msgstr ""
+"Пожалуйста, нажмите на <strong>Скачать список</strong>, чтобы скачать и "
+"отобразить список возможных модулей."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesPanel.java:112
@@ -12257,4 +12407,6 @@
 "validate again.</html>"
 msgstr ""
+"<html>''{0}'' является неверной URL OSM API.<br>Пожалуйста, проверьте "
+"правильность написания и попытайтесь ещё раз.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:66
@@ -12269,4 +12421,6 @@
 "<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
@@ -12276,4 +12430,7 @@
 "''{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
@@ -12290,4 +12447,7 @@
 "<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
@@ -12298,21 +12458,26 @@
 "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 "Обычная авторизация"
+msgstr "Обычная идентификация"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
 msgid ""
 "Select to use HTTP basic authentication with your OSM username and password"
-msgstr "Использовать простую HTTP авторизацию используя ваши имя и пароль ОСМ"
+msgstr ""
+"Использовать простую HTTP идентификацию личности, используя ваши имя и "
+"пароль OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
 msgid "Use OAuth"
-msgstr "\"Открытый протокол авторизации\" (OAuth)"
+msgstr "OAuth (Открытый протокол авторизации)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68
 msgid "Select to use OAuth as authentication mechanism"
-msgstr "Использовать механизм \"открытого протокола авторизации\" (OAuth)"
+msgstr "Использовать алгоритм OAuth (для идентификации личности)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
@@ -12322,4 +12487,7 @@
 "authentication method ''Basic Authentication''."
 msgstr ""
+"Предупреждение: Неподдерживаемое значение в настройке ''{0}'', получено "
+"{1}''. Используется метод установления личности пользователя ''Обычная "
+"идентификация\"."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BackupPreferencesPanel.java:29
@@ -12335,9 +12503,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:54
 msgid "OSM username:"
-msgstr "OSM имя:"
+msgstr "Имя в OSM:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:67
 msgid "OSM password:"
-msgstr "OSM пароль:"
+msgstr "Пароль в OSM:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
@@ -12350,5 +12518,5 @@
 "<html><body><p class=\"warning-body\"><strong>Внимание:</strong> В этом "
 "режиме, пароль хранится в виде обычного текста в настройках JOSM файла. "
-"Кроме того, он передается в каждом запросе на сервер ОСМ в "
+"Кроме того, он передается в каждом запросе на сервер OSM в "
 "<strong>незашифрованном</strong> виде. <strong>Не используйте здесь важных "
 "паролей.</strong></p></body></html>"
@@ -12357,4 +12525,6 @@
 msgid "Warning: failed to retrieve OSM credentials from credential manager."
 msgstr ""
+"Предупреждение: не удалось извлечь учётные данные OSM из менеджера учётных "
+"данных."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:118
@@ -12364,11 +12534,11 @@
 #, java-format
 msgid "Current credential manager is of type ''{0}''"
-msgstr ""
+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 в менеджере "
-"удостоверения личности."
+"Предупреждение: Не удалось сохранить учётные данные OSM в менеджере учётных "
+"данных."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:150
@@ -12376,5 +12546,5 @@
 msgstr ""
 "Предупреждение: Не удалось получить маркер доступа OAuth от менеджера "
-"удостоверения личности"
+"учётных данных"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java:181
@@ -12382,5 +12552,5 @@
 msgstr ""
 "Предупреждение: Не удалось сохранить маркер доступа OAuth в менеджере "
-"удостоверения личности"
+"учётных данных"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:186
@@ -12389,8 +12559,11 @@
 "Please authorize first."
 msgstr ""
+"У вас ещё нет маркера доступа, чтобы получить доступ к серверу OSM с помощью "
+"OAuth. Пожалуйста, сначала авторизуйтесь."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:225
 msgid "You already have an Access Token to access the OSM server using OAuth."
 msgstr ""
+"У вас уже есть маркер доступа для доступа к серверу OSM, с помощью OAuth."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:257
@@ -12400,5 +12573,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:306
 msgid "Click to step through the OAuth authorization process"
-msgstr ""
+msgstr "Нажмите, чтобы пройти пошаговый процесс авторизации OAuth"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:330
@@ -12411,8 +12584,11 @@
 "Access Token"
 msgstr ""
+"Нажмите, чтобы пройти процесс авторизации OAuth и создать новый маркер "
+"доступа"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:356
 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
@@ -12420,9 +12596,9 @@
 msgid "<html>Use the default OSM server URL (<strong>{0}</strong>)</html>"
 msgstr ""
-"<html>Использовать сервер ОСМ по умолчанию (<strong>{0}</strong>)</html>"
+"<html>Использовать сервер OSM по умолчанию (<strong>{0}</strong>)</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:88
 msgid "OSM Server URL:"
-msgstr "URL сервера ОСМ"
+msgstr "URL сервера OSM:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:152
@@ -12440,17 +12616,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:174
 msgid "Validation failed. The API URL seems to be invalid."
-msgstr ""
+msgstr "Проверка не прошла. URL API выглядит неправильной."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:235
 msgid "OSM API URL must not be empty. Please enter the OSM API URL."
-msgstr ""
+msgstr "URL OSM API не должна быть пустой. Пожалуйста, введите URL OSM API."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:239
 msgid "The current value is not a valid URL"
-msgstr ""
+msgstr "Текущее значение это неверная URL"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:241
 msgid "Please enter the OSM API URL."
-msgstr ""
+msgstr "Пожалуйста, введите URL OSM API."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:104
@@ -12469,6 +12645,6 @@
 "Please enter a username and a password if your proxy requires authentication."
 msgstr ""
-"Пожалуйста введите имя пользователя и пароль, если Ваш прокси-сервер требует "
-"авторизацию"
+"Пожалуйста введите имя пользователя и пароль, если ваш прокси-сервер требует "
+"идентификацию личности"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:144
@@ -12505,4 +12681,8 @@
 "JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
 msgstr ""
+"Внимание: JOSM настроен на использование прокси-сервера, однако Ваша Java-"
+"машина не сконфигурирована для этого должным образом. Установите параметр "
+"\"Нет прокси\" (JOSM: Настройки->Параметры соединения->Настройки прокси-"
+"сервера)"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
@@ -12528,5 +12708,12 @@
 msgstr "Удалить отмеченное в таблице тегов"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -12534,18 +12721,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "Дополнительные атрибуты:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr "замкнутая линия"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Неизвестный тип: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -12556,16 +12743,16 @@
 msgstr "Не удалось прочитать источник заготовок тегов: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Ошибка при разборе {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "Элемент типа {0} не поддерживается."
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -12575,18 +12762,17 @@
 msgstr[2] "Изменить {0} объектов"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "Ничего не выделено!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "Неудачный выбор!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "Применить шаблон"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Изменить параметры"
@@ -12623,4 +12809,6 @@
 "a bounding box)"
 msgstr ""
+"URL от www.openstreetmap.org (вы можете вставить URL для скачивания с "
+"сервера здесь, чтобы указать границы редактирования)"
 
 #: ../core/src/org/openstreetmap/josm/io/AllFormatsImporter.java:15
@@ -12643,9 +12831,11 @@
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
 "capabilities. Got ''{2}''"
-msgstr "Неверное значение атрибута ''{0}'' на теге XML ''{1}''. Получено {2}."
+msgstr ""
+"Предупреждение: неверное значение атрибута ''{0}'' элемента ''{1}'' в "
+"настройках возможностей сервера. Получено ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
@@ -12669,10 +12859,10 @@
 #, java-format
 msgid "Illegal longitude value for parameter ''{0}'', got {1}"
-msgstr ""
+msgstr "Неверное значение долготы для параметра ''{0}'', получено {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:131
 #, java-format
 msgid "Illegal latitude value for parameter ''{0}'', got {1}"
-msgstr ""
+msgstr "Неверное значение широты для параметра ''{0}'', получено {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:294
@@ -12689,4 +12879,5 @@
 msgid "Unexpected value for ''{0}'' in changeset query url, got {1}"
 msgstr ""
+"Неожиданное значение для ''{0}'' в URL запроса пакета правок, получено {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:362
@@ -12696,9 +12887,11 @@
 "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 ""
+msgstr "Неподдерживаемый параметр ''{0}'' в строке запроса пакета правок"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:84
@@ -12707,4 +12900,5 @@
 "Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
 msgstr ""
+"Неожиданный формат для номера порта в настройке ''{0}''. Получено ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
@@ -12714,15 +12908,15 @@
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 msgid "The proxy will not be used."
-msgstr ""
+msgstr "Прокси не будет использован."
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:89
 #, java-format
 msgid "Illegal port number in preference ''{0}''. Got {1}."
-msgstr ""
+msgstr "Неправильный номер порта в настройке ''{0}''. Получено {1}."
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:103
 #, java-format
 msgid "Warning: no preference ''{0}'' found."
-msgstr ""
+msgstr "Предупреждение: отсутствует параметр ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:109
@@ -12732,4 +12926,6 @@
 "use no proxy."
 msgstr ""
+"Предупреждение: найденонеожиданное значение для настройки ''{0}''. Получено "
+"''{1}''. Прокси не будет использоваться."
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:120
@@ -12739,4 +12935,6 @@
 "''{1}''."
 msgstr ""
+"Предупреждение: Неожиданные параметры для прокси HTTP. Получен хост ''{0}'' "
+"и порт ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:132
@@ -12746,4 +12944,6 @@
 "''{1}''."
 msgstr ""
+"Предупреждение: Неожиданные параметры для прокси SOCKS. Получен хост ''{0}'' "
+"и порт ''{1}''."
 
 #. Just log something. The network stack will also throw an exception which will be caught
@@ -12755,4 +12955,6 @@
 "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:152
@@ -12762,4 +12964,7 @@
 "time.  Will not use a proxy."
 msgstr ""
+"Предупреждение: В системных настройках JVM указано, не использовать прокси. "
+"Свойство ''java.net.useSystemProxies'' отсутствовало в момент загрузки. "
+"Прокси не будет использоваться."
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83
@@ -12770,5 +12975,5 @@
 #, java-format
 msgid "Unexpected XML element with name ''{0}''"
-msgstr ""
+msgstr "Неожиданный элемент XML с именем ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/io/FileExporter.java:24
@@ -12794,5 +12999,5 @@
 #, java-format
 msgid "<html>Could not read files.<br> Error is: <br>{0}</html>"
-msgstr ""
+msgstr "<html>Невозможно прочитать файлы.<br> Ошибка: <br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:41
@@ -12864,6 +13069,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12877,4 +13082,5 @@
 "available"
 msgstr ""
+"Произошла ошибка при разборе файла gpx {0}. Доступна только часть файла"
 
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:79
@@ -12888,9 +13094,9 @@
 msgstr "Парсинг файла \"{0}\" потерпел неудачу"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Ошибка разбора: неправильная структура документа gpx"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12906,7 +13112,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
-#, fuzzy
 msgid "Looking for image files"
-msgstr "Поиск береговой линии..."
+msgstr "Поиск файлов изображений"
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
@@ -12914,14 +13119,21 @@
 msgstr "Файлы изображений не найдены"
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
-msgstr ""
+msgstr "Невозможно открыть входящий поток для ресурса ''{0}''"
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, fuzzy, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr ""
+"Предупреждение: не удалось прочитать MOTD из ''{0}''. Исключение было: {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#, fuzzy, java-format
+#, java-format
 msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
-"Нет элемента с id {0} в локальном наборе данных. Невозможно вывести тип "
+"Нет элементов с  id {0} в местной базе данных. Невозможно вывести тип "
 "элемента."
 
@@ -12991,5 +13203,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "Координаты импортированы: "
@@ -13094,10 +13306,10 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Загрузка {0} объектов на сервер..."
-msgstr[1] "Загрузка {0} объектов на сервер..."
-msgstr[2] "Загрузка {0} объектов на сервер..."
+msgstr[0] "Загрузка на сервер {0} объекта..."
+msgstr[1] "Загрузка на сервер {0} объектов..."
+msgstr[2] "Загрузка на сервер {0} объектов..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -13159,4 +13371,6 @@
 msgid "Prolog of OsmChange document already written. Please write only once."
 msgstr ""
+"Пролог документа OsmChange уже записан. Пожалуйста записывайте только один "
+"раз."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangeBuilder.java:93
@@ -13244,4 +13458,6 @@
 "({1},{2}). Skipping."
 msgstr ""
+"Предупреждение: неподдерживаемый начальный элемент ''{0}'' в содержимом "
+"пакета правок в позиции ({1},{2}). Пропущено."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:241
@@ -13250,4 +13466,6 @@
 "''create'', ''modify'', or ''delete''."
 msgstr ""
+"Неправильная структура документа. Найдены node, way, или relation за "
+"пределами ''create'', ''modify'', или ''delete''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:259
@@ -13257,4 +13475,6 @@
 "({1},{2}). Skipping."
 msgstr ""
+"Предупреждение: неподдерживаемый конечный элемент ''{0}'' в содержимом "
+"пакета правок в позиции ({1},{2}). Пропущено."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:307
@@ -13305,4 +13525,6 @@
 msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
 msgstr ""
+"Не удалось подписать соединение HTTP, используя заголовок идентификации "
+"личности OAuth"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmConnection.java:136
@@ -13310,4 +13532,5 @@
 msgid "Warning: unexpected value for preference ''{0}''. Got ''{1}''."
 msgstr ""
+"Предупреждение: неожиданное значение настройки ''{0}''. Получено ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmDataParsingException.java:44
@@ -13361,4 +13584,6 @@
 "internal id {2}"
 msgstr ""
+"Предупреждение: игнорирование пакета id пакета правок {0} для нового объекта "
+"с внешним id {1} и внутренним id {2}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:223
@@ -13471,4 +13696,6 @@
 "Resetting to 0."
 msgstr ""
+"Неверное значение атрибуда ''changeset'' для нового объекта {1}. Получено "
+"{0}. Будет сброшено к 0."
 
 #. for an existing primitive this is a problem
@@ -13477,5 +13704,5 @@
 #, java-format
 msgid "Illegal value for attribute ''changeset''. Got {0}."
-msgstr ""
+msgstr "Неверное значение атрибута ''changeset''. Получено {0}."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:443
@@ -13660,10 +13887,10 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159
-#, fuzzy, java-format
+#, java-format
 msgid "({0}/{1}) Uploading {2} object..."
 msgid_plural "({0}/{1}) Uploading {2} objects..."
-msgstr[0] "({0}/{1}) Передача {2} объектов..."
-msgstr[1] "({0}/{1}) Передача {2} объектов..."
-msgstr[2] "({0}/{1}) Передача {2} объектов..."
+msgstr[0] "({0}/{1}) Загрузка {2} объект..."
+msgstr[1] "({0}/{1}) Загрузка {2} объектов..."
+msgstr[2] "({0}/{1}) Загрузка {2} объектов..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
@@ -13673,5 +13900,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmWriter.java:192
 msgid "Unexpected id 0 for osm primitive found"
-msgstr ""
+msgstr "Обнаружен неожиданный id 0 для элемента osm"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:89
@@ -13698,4 +13925,6 @@
 "Skipping download."
 msgstr ""
+"Предупреждение: Невозможно скачать с сервера модуль ''{0}''. Неизвестна "
+"ссылка для его скачивания. Скачивание с сервера пропущено."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:126
@@ -13705,9 +13934,11 @@
 "valid URL. Skipping download."
 msgstr ""
+"Предупреждение: Невозможно скачать модуль ''{0}''. Ссылка для его скачивания "
+"''{1}'' не является верной ссылкой. Скачивание с сервера пропущено."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:154
 #, java-format
 msgid "Failed to create plugin directory ''{0}''"
-msgstr ""
+msgstr "Не удалось создать каталог модуля ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:162
@@ -13731,5 +13962,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Loading of the plugin \"{0}\" was requested.<br>This plugin is no "
@@ -13737,7 +13968,7 @@
 "disabled.<br>Delete from preferences?</html>"
 msgstr ""
-"<html>Была запрошена загрузка модуля {0}.<br>Этот модуль больше не "
-"разрабатывается и, весьма вероятно, будет выдавать ошибки.<br>Он должен быть "
-"отключён.<br>Удалить из настроек?</html>"
+"<html>Была запрошена загрузка модуля \"{0}\".<br>Этот модуль больше не "
+"усовершенствуется и, похоже, будет ошибочно работать.<br>Лучше его отключить."
+"<br>Удалить его из настроек?</html>"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:167
@@ -13746,4 +13977,6 @@
 "updated as well.<br><br>Update plugins now?"
 msgstr ""
+"Вы обновили ваше программное обеспечение JOSM.<br>Чтобы не было проблем, "
+"модули тоже стоит обновить.<br><br>Обновить модули сейчас?"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:183
@@ -13753,7 +13986,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:194
-#, fuzzy
 msgid "Click to update the activated plugins"
-msgstr "Обновить выделенные модули"
+msgstr "Нажмите, чтобы обновить установленные модули"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
@@ -13763,8 +13995,8 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:200
 msgid "Click to skip updating the activated plugins"
-msgstr ""
+msgstr "Нажмите, чтобы пропустить обновление активированных модулей"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -13772,9 +14004,10 @@
 "Plugin {0} requires {1} plugins which were not found. The missing plugins "
 "are:"
-msgstr[0] "Модуль, необходимый для модуля {0} не был найден. Необходим модуль:"
+msgstr[0] ""
+"Модулю {0} требуется модуль, который не найден. Отсутствующий модуль:"
 msgstr[1] ""
-"{1} модуля, необходимых для модуля {0} не было найдено. Необходимы модули:"
+"Модулю {0} требуется {1} модуля, которые не найдены. Отсутствующие модули:"
 msgstr[2] ""
-"{1} модулей, необходимых для модуля {0} не было найдено. Необходимы модули:"
+"Модулю {0} требуется {1} модулей, которые не найдены. Отсутствующие модули:"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13784,4 +14017,6 @@
 "<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:349
@@ -13842,5 +14077,4 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:559
-#, fuzzy
 msgid ""
 "Please open the Preference Dialog after JOSM has started and try to update "
@@ -13851,5 +14085,5 @@
 msgstr[0] ""
 "Пожалуйста, откройте диалог настроек после запуска JOSM и попытайтесь "
-"обновить их вручную."
+"обновить его вручную."
 msgstr[1] ""
 "Пожалуйста, откройте диалог настроек после запуска JOSM и попытайтесь "
@@ -13870,7 +14104,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:625
-#, fuzzy, java-format
+#, java-format
 msgid "Click to delete the plugin ''{0}''"
-msgstr "звгрузка с сервера модуля ''{0}''"
+msgstr "Нажмите, чтобы удалить модуль ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
@@ -13881,12 +14115,12 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:631
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:724
-#, fuzzy, java-format
+#, java-format
 msgid "Click to keep the plugin ''{0}''"
-msgstr "звгрузка с сервера модуля ''{0}''"
+msgstr "Нажмите, чтобы сохранить модуль ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:700
 #, java-format
 msgid "Warning: failed to delete outdated plugin ''{0}''."
-msgstr ""
+msgstr "Предупреждение: не удалось удалить устаревший модуль ''{0}''."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:701
@@ -13897,4 +14131,6 @@
 "installation. JOSM still going to load the old plugin version."
 msgstr ""
+"Предупреждение: не удалось установить уже скачанный с сервера модуль "
+"''{0}''. Установка пропущена. JOSM собирается загрузить старую версию модуля."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:706
@@ -13904,9 +14140,11 @@
 "''{1}''. Renaming failed."
 msgstr ""
+"Предупреждение: не удалось установить модуль ''{0}'' из временно "
+"загруженного файла ''{1}''. Переименование не удалось."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#, fuzzy, java-format
+#, java-format
 msgid "Click to disable the plugin ''{0}''"
-msgstr "звгрузка с сервера модуля ''{0}''"
+msgstr "Нажмите, чтобы отменить модуль ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:731
@@ -13950,12 +14188,11 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:890
-#, fuzzy
 msgid "Do not check and ask again at startup (remembers choice)"
-msgstr "Не показывать снова (запомнить выбор)"
+msgstr "Не проверять и не спрашивать при загрузке (запомнить выбор)"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:69
-#, fuzzy, java-format
+#, java-format
 msgid "The plugin file ''{0}'' does not include a Manifest."
-msgstr "Файл \"{0}\" не существует"
+msgstr "Файл модуля ''{0}'' Не содержит соглашения."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:181
@@ -13967,14 +14204,14 @@
 #, java-format
 msgid "Failed to create plugin information from manifest for plugin ''{0}''"
-msgstr ""
+msgstr "Невозможно извлечь информацию о модуле из соглашения модуля ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:41
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:46
 msgid "Reading local plugin information.."
-msgstr ""
+msgstr "Чтение информации об установленных модулях..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:80
 msgid "Processing plugin site cache files..."
-msgstr ""
+msgstr "Обработка файлов из кеша от сайта модулей..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:84
@@ -13982,5 +14219,5 @@
 #, java-format
 msgid "Processing file ''{0}''"
-msgstr ""
+msgstr "Обработка файла ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:88
@@ -13989,8 +14226,10 @@
 msgid "Warning: Failed to scan file ''{0}'' for plugin information. Skipping."
 msgstr ""
+"Предупреждение: Не удалось просканировать файл ''{0}'' на информацию о "
+"модуле. Пропущено."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java:105
 msgid "Processing plugin files..."
-msgstr ""
+msgstr "Обработка файлов модулей..."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:48
@@ -14001,5 +14240,5 @@
 #, java-format
 msgid "Downloading plugin list from ''{0}''"
-msgstr ""
+msgstr "Скачивание списка модулей с ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:163
@@ -14009,14 +14248,16 @@
 "from plugin site ''{1}''."
 msgstr ""
+"Предупреждение: не удалось создать каталог модуля ''{0}''. Невозможно "
+"записать в кэш список модулей с сайта модулей ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:167
 #, java-format
 msgid "Writing plugin list to local cache ''{0}''"
-msgstr ""
+msgstr "Запись списка модулей в локальный кэш ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:191
 #, java-format
 msgid "Parsing plugin list from site ''{0}''"
-msgstr ""
+msgstr "Разбор списка модулей с сайта ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:196
@@ -14027,9 +14268,11 @@
 "Exception was: {1}"
 msgstr ""
+"Ошибка разбора документа списка модулей с сайта ''{0}''. Сайт пропущен. "
+"Исключение было: {1}"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:209
 #, java-format
 msgid "Processing plugin list from site ''{0}''"
-msgstr ""
+msgstr "Обработка списка модулей с сайта ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:301
@@ -14052,5 +14295,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -14058,8 +14300,7 @@
 "file a bug report."
 msgstr ""
-"Произошла неожиданная ошибка.\n"
-"\n"
-"Это всегда говорит об ошибке в коде программы. Если Вы пользуетесь\n"
-"последней версией JOSM, будьте добры, отправьте отчёт об ошибке."
+"Произошла неожиданная ошибка.<br>Это всегда ошибка программирования. Если вы "
+"пользуетесь последней<br>версией JOSM, пожалуйста, не сердитесь и заполните "
+"заявку на исправление ошибки."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -14072,4 +14313,6 @@
 "you have updated to the latest version of JOSM here:"
 msgstr ""
+"Произошла ошибка при работе JOSM. Прежде чем вы сообщите нам о произошедшей "
+"ошибке, убедитесь, что вы используете последнюю версию JOSM:"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:121
@@ -14124,4 +14367,8 @@
 "Access Token.</html>"
 msgstr ""
+"<html>Не удалось идентифицировать сервер OSM ''{0}''.<br>Вы используете "
+"идентификацию OAuth, но в настоящий момент нет<br>сконфигурированного "
+"маркера доступа OAuth.<br>Пожалуйста откройте диалог настроек и сгенерите "
+"или введите маркер доступа.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:77
@@ -14154,6 +14401,7 @@
 "html>"
 msgstr ""
-"<html><Авторизация на сервере OSM с именем пользователя ''{0}'' неудалась. "
-"<br> Проверьте имя пользователя и пароль в настройках JOSM. </html>"
+"<html><Идентификация личности на сервере OSM с именем пользователя ''{0}'' "
+"неудалась. <br> Проверьте имя пользователя и пароль в настройках JOSM. </"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:122
@@ -14164,13 +14412,20 @@
 "html>"
 msgstr ""
+"<html>Идентификация личности на сервере OSM с маркером OAuth ''{0}'' не "
+"удалась.<br>Пожалуйста, запустите диалог настроек и получите другой маркер "
+"OAuth.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:132
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
+"<br>The token is not authorised to access the protected resource<br>''{1}''."
 "<br>Please launch the preferences dialog and retrieve another OAuth token.</"
 "html>"
 msgstr ""
+"<html>Авторизация на сервере OSM с помощью маркера OAuth ''{0}'' не удалась."
+"<br>Данный маркер не предоставляет  доступ к защищённым ресурсам<br>''{1}''."
+"<br>Пожалуйста, откройте диалог настроек и получите новый маркер OAuth.</"
+"html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:168
@@ -14314,6 +14569,6 @@
 msgstr "Не могу найти перевод {0}. Возвращено к {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -14324,5 +14579,5 @@
 "данных. Пояснение: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -14380,5 +14635,5 @@
 #: ../core/src/org/openstreetmap/josm/tools/Shortcut.java:457
 msgid "(Hint: You can edit the shortcuts in the preferences.)"
-msgstr "(Подсказка: Горячие клавиши можно назначить в настройках программы)"
+msgstr "(Подсказка: Горячие клавиши можно назначить в настройках)"
 
 #: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:56
@@ -14495,4 +14750,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr "Видимость"
@@ -14583,5 +14839,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "Интерполяция адресов"
@@ -14933,5 +15189,5 @@
 "preferences."
 msgstr ""
-"Заменить оригинальный белый фон на цвет фона, определенные в настройках JOSM."
+"Заменить оригинальный белый фон на цвет фона, заданный в настройках JOSM."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:94
@@ -15187,5 +15443,5 @@
 "Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
-"Выбранный файл {0} это не кэш-файл из этого плагина (неверное расширение)"
+"Выбранный файл {0} это не кэш-файл из этого модуля (неверное расширение)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:70
@@ -15207,5 +15463,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr "Расположение"
@@ -15373,21 +15629,21 @@
 "Удалите полигон из отношения, прежде чем разрезать его."
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr "TangoGPS Файлы (*.log)"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr "Ошибки формата: "
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr "Импорт TangoGPS успешно окончен"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr "Импорт TangoGPS окончен ошибкой!"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr "Файлы TCX (*.tcx)"
@@ -15419,9 +15675,9 @@
 msgstr "Создать копию линии"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr "Слой для редактирования GPX треков"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Преобразовать в GPX слой с обезличенным временем"
@@ -15436,13 +15692,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr "Импортировать путь из слоя данных GPX"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr "Очистить существующий путь"
@@ -15451,6 +15707,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr "Не найдено слоя данных GPX"
@@ -15679,17 +15935,17 @@
 msgstr "Загрузить набор изображений на новый слой."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../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:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr "Начальное положение за границами рамки."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../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:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -15733,42 +15989,41 @@
 msgstr "Удаление повторяющихся точек..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr "Трассировщик озёр"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr "Произошла неизвестная ошибка"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "восток"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "северо-восток"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "север"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "северо-запад"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "запад"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "юго-запад"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "юг"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "юго-восток"
@@ -15824,6 +16079,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -15832,74 +16087,74 @@
 msgstr "вода"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "береговая линия"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "земля"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../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:43
+#: ../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:45
+#: ../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:47
+#: ../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:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Разрешение в квадратах спутниковых снимков (пикселей на градус)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Размер квадратов спутниковых снимков (точек)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../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:55
+#: ../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:57
+#: ../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:59
+#: ../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:61
+#: ../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:63
+#: ../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:65
+#: ../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:67
+#: ../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:70
+#: ../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:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -15909,5 +16164,5 @@
 "линий). По умолчанию 50000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -15917,5 +16172,5 @@
 "Лэндсат IR-1). Может быть в диапазоне 0-255. Стандартное значение 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -15926,5 +16181,5 @@
 "умолчанию 0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -15933,24 +16188,24 @@
 "- 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 "Размер одного квадрата спутникового снимка, в пикселях. По умолчанию 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../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:77
+#: ../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:78
+#: ../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:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
@@ -15958,33 +16213,34 @@
 "ничего. По умолчанию - вода."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../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:81
+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 "Макс. размер каждого каталога с кэшем, байт (по умолчанию 300 МБ)."
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+msgstr "Макс. размер каждого каталога кэша в байтах. По умолчанию 300 МБ."
+
+#: ../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:83
+msgstr ""
+"Макс. возраст каждого кэшированного файла в днях. По умолчанию 100 дней."
+
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
-msgstr "Данные исходного текста. По умолчанию Лэндсат."
-
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+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:86
+#: ../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:48
+#: ../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:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr "Невозможно получить изображение"
@@ -16008,5 +16264,5 @@
 msgstr "Ошибка при подключении"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr "без имени"
@@ -16037,5 +16293,5 @@
 msgstr "Курс"
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr "Слой LiveGPS"
@@ -16110,5 +16366,5 @@
 msgstr "Угол между двумя выделенными точками"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr "Слой для проведения измерений"
@@ -16382,4 +16638,76 @@
 msgid "Firefox executable"
 msgstr "исполняемый файл Firefox"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#, fuzzy
+msgid "Read error!"
+msgstr "Резервуар"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Введите координаты новой точки"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Сохранять резервные копии"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Ошибка"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "Невозможно удалить файл изображения."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Не возможно переименовать файл ''{0}''"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Сохранять резервные копии"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "Сохранять резервные копии"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Перезаписать"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+#, fuzzy
+msgid "Could not delete temporary file!"
+msgstr "Невозможно импортировать файлы."
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
@@ -16550,5 +16878,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:86
 msgid "Configure routing preferences."
-msgstr "Настройка предпочтений маршрутизации."
+msgstr "Задать настройки маршрутизации."
 
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:91
@@ -16658,6 +16986,6 @@
 msgstr "Сохранять захваченные данные в файл каждую минуту."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -16783,74 +17111,132 @@
 msgid "You have to specify tagging preset sources in the preferences first."
 msgstr ""
-"В первую очередь Вы должны указать в настройках источники заготовок тегов."
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+"В первую очередь вы должны указать в настройках источники заготовок тегов."
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+#, fuzzy
+msgid "Terrace a house"
+msgstr "Ряд домов вдоль улицы"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+msgid "Interpolation"
+msgstr "Интерполяция"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr "Сегменты"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Улицы"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Максимальный номер"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Минимальный номер"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+#, fuzzy
+msgid "Lowest housenumber of the terraced house"
+msgstr "Самые маленький номер дома не может быть больше чем самой большой"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Создать новое отношение"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Удалить дубликаты линий"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Название улицы"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr "Четные/Нечётные"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr "Минимальный номер"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr "Максимальный номер"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr "Сегменты"
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr "Самые маленький номер дома не может быть больше чем самой большой"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr "номера домов не соответствуют установкам четных/нечетных"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr "Сегмент должен быть числом больше 1"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr "{0} должно быть больше, чем 0"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr "{0} не число"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr "Обратный ряд домов вдоль улицы"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr "Перевернуть номера домов вдоль улицы"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr "Обратный ряд домов вдоль улицы"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:83
+#, fuzzy
+msgid "Cannot reverse!"
+msgstr "не существует"
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:125
 msgid "Reverse Terrace"
 msgstr "Обратный ряд домов вдоль улицы"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr "Ряд домов вдоль улицы"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr "Создать отдельные здания  из длинного здания"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr "Выберите одну замкнутую линию, содержащую, не менее четырёх точек."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr "Ряд домов вдоль улицы"
@@ -16898,5 +17284,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:81
 msgid "Show informational level on upload."
-msgstr "Показать информационный уровень при загрузке на сервер."
+msgstr "Показать информационный уровень при загрузке на сервер"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:82
@@ -17070,5 +17456,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:46
 msgid "Crossing ways."
-msgstr "Пересекающиеся линии."
+msgstr "Пересекающиеся линии"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:47
@@ -17090,5 +17476,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr "Дублированные точки"
@@ -17098,5 +17484,5 @@
 msgstr "Этот тест проверяет, чтобы не было наложенных точек."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -17108,9 +17494,9 @@
 "могут использовать их.<br> Вы действительно хотите удалить эти точки?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr "Подтверждение"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr "Точки в одной и той же позиции"
@@ -17147,5 +17533,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr "Область с вложениями"
@@ -17213,5 +17599,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:43
 msgid "Overlapping ways."
-msgstr "Совпадающие линии."
+msgstr "Совпадающие линии"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:44
@@ -17297,7 +17683,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr "Неправильная комбинация тегов/значений"
@@ -17305,80 +17691,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr "Проблемы отображения"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Неправильный ключ {0}."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr "Теги с пустыми значениями"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr "Неверный ключ свойств"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr "Неправильный пробел в названии ключа"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr "Значение начинается или заканчивается пробелом"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr "Значения содержат HTML разметку"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Ключа ''{0}'' нет в настройках."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr "Установки не содержат собственно ключа"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Значение ''{0}'' для ключа ''{1}'' не установлены заранне."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr "Не содержит зарание устанвленного значения"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
-msgstr "FIXMES"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+msgstr "FIXME"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
-msgstr "Проверить корректность ключей."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+msgstr "Проверить ключи тегов"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
-msgstr "Проверьте, что ключ действителен проверен в отношении списка слов."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+msgstr "Проверить, что ключи тегов прошли проверку в отношении списка слов."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr "Использовать сложную проверку"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr "Проверка корректности значений и тегов, использующих сложные правила."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr "Источник средства проверки тегов"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -17388,68 +17774,67 @@
 "openstreetmap.org/index.php/User:JLS/speller) или тег проверки файлов данных."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr "Добавить в список новый источник."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr "Править выбранный источник."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "Удалить источник из списка."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "Источники данных"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
-msgstr "Проверить корректность значений"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+msgstr "Проверить значения тегов"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
-"Проверьте что правильные значения являются действительными в отношении "
-"установок проверки."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+"Проверить, что значения тегов прошли проверку в отношении предустановок."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
-msgstr "Проверить для FIXMES."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+msgstr "Проверить на FIXME"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 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:737
+msgstr "Ищет точки или линии с FIXME в любом значении свойства."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
-msgstr "Проверить заметки."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+msgstr "Проверить замечания к рисунку"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr "Проверить содержит ли нарисованная карта ошибки данных"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
-msgstr "Использовать файл данных по умолчанию."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+msgstr "Использовать файл данных по умолчанию"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
-msgstr "Используется файл данных установленный по умолчанию"
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+msgstr "Используется файл данных, установленный по умолчанию."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
-msgstr "Использовать по умолчанию файл с игнориованными тегами."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+msgstr "Использовать по умолчанию файл с игнорированными тегами"
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
-"Использовать по умолчанию файл с игнориованными тегами (рекомендовано)."
-
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+"Использовать по умолчанию файл с игнорированными тегами (рекомендовано)."
+
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr "Использовать установленный по умолчанию файл проверки правописания"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr ""
@@ -17457,22 +17842,22 @@
 "(рекомендуется)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr "Исправить параметры"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr "Не удалось найти тип элемента"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr "Не удалось найти  уровень предупреждения"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Недопустимое выражение ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -17940,5 +18325,5 @@
 msgstr "Скачивание слоя WMS ({0}), в масштабе {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -17953,13 +18338,17 @@
 "попытаться извлечь квадраты WMS?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr "Да, выбрать изображения"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr "Ошибочная ссылка?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+msgid "Download visible tiles"
+msgstr "Скачать видимые квадраты карты"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -17968,37 +18357,33 @@
 "измените разрешение"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
-msgid "Download visible tiles"
-msgstr "Скачать видимые квадраты карты"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "Изменить разрешение"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr "Перезагрузить ошибочные квадраты карты"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr "Альфа канал"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "Сохранить слой WMS в файл"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr "Сохраниеть WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "Загрузить слой WMS из файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr "Загрузить WMS слой"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
@@ -18006,13 +18391,13 @@
 "Не поддерживаемый формат версии WMS файла; обнаружено {0}, ожидалось {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr "Ошибка формата файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "Ошибка при загрузке файла"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr "Установить закладку WMS"
@@ -18154,5 +18539,5 @@
 "между ними. Просто измените цвет и создайте новую схему. Используется для "
 "переключения на белый фон с соответствующими цветами для большей наглядности "
-"при ярком солнечном свете. См. окно настроек JOSM и \"Настройки Карты"
+"при ярком солнечном свете. См. окно настроек JOSM и \"Настройки карты"
 "\" (странно, но это так :-)"
 
@@ -18202,6 +18587,5 @@
 msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
 msgstr ""
-"Принять GPS данные со спутника GlobalSat dg100 Data Logger непосредственно в "
-"JOSM."
+"Позволяет скачать точки GPS с Globalsat dg100 data logger напрямую в JOSM."
 
 #. Plugin graphview
@@ -18298,6 +18682,13 @@
 msgstr "Запуск FireFox для отображения текущего вида как SVG изображения."
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -18308,15 +18699,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Великолепный JGoodies Пластиковый Скин."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr "Разрешить другим приложениям посылать команды JOSM."
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -18327,10 +18718,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr "Предоставляет возможности маршрутизации."
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -18341,15 +18732,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Разрешить добавить метки/точки в текущей GPS позиции."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Показывает окно для редактирования тегов в табличной сетке."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -18362,10 +18753,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr "Сделать ряд домов вдоль улицы из одного блока."
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -18377,5 +18768,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -18386,10 +18777,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "Быстрое скачивание вдоль большого набора связанных линий"
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -18498,6 +18889,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -18505,6 +18905,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "Сноска"
@@ -18521,5 +18922,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Полосы"
@@ -18541,10 +18942,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Макс. скорость (км/ч)"
@@ -18588,14 +18989,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "Односторонняя"
@@ -18638,13 +19039,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -18682,13 +19083,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Тоннель"
@@ -18723,13 +19124,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "Разрезание"
@@ -18764,13 +19165,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "Насыпь"
@@ -18902,4 +19303,13 @@
 msgid "Edit Unclassified Road"
 msgstr "Править неклассифицированную дорогу"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr "Проезжаемые места"
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -18917,15 +19327,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr "Ширина (метры)"
@@ -18937,5 +19347,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Местного значения"
@@ -18944,5 +19354,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "Править улицу местного значения"
@@ -18960,16 +19370,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Дорожное покрытие"
@@ -18991,166 +19404,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr "асфальтированная"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr "неасфальтированная"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr "асфальт"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr "бетон"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr "металл"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "лес"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr "дорожные_камни"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr "мостовая"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "гравий"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr "pebblestone"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr "сжато"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr "grass_paver"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "трава"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "песок"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr "грунт"
@@ -19158,5 +19578,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr "Жилая улица"
@@ -19165,5 +19585,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr "Править жилую улицу"
@@ -19171,5 +19591,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "Пешеходная"
@@ -19178,5 +19598,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "Править пешеходную улицу"
@@ -19184,5 +19604,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr "Служебная"
@@ -19191,5 +19611,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr "Править служебный проезд"
@@ -19199,18 +19619,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr "Тип служебного проезда"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr "проезд"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr "driveway"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr "парковочный проезд"
@@ -19218,5 +19638,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr "Проезд на парковке"
@@ -19226,5 +19646,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr "Изменить автомобильный проезд"
@@ -19232,5 +19652,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "Дорога (тип неизвестен)"
@@ -19239,5 +19659,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "Править дорогу неизвестного типа"
@@ -19246,20 +19666,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "Дорожные ограничения"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "Править дорожные ограничения"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "Платная"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "Тупик"
@@ -19267,9 +19687,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 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"
@@ -19280,6 +19701,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -19291,4 +19710,5 @@
 #. 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"
@@ -19307,141 +19727,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "частный"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr "разрешающее"
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr "сельскохозяйственное"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "частный"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "назначение"
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr "разрешающее"
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr "сельскохозяйственное"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "нет"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr "Земли сельскохозяйственного назначения"
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr "Грузовик (до 3.5т)"
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Грузовик (более 3.5т)"
@@ -19456,10 +19884,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr "Лошадь"
@@ -19475,10 +19903,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "Мотоцикл"
@@ -19493,27 +19921,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr "Автомобиль"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr "Транспортные средства общего пользования"
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr "Моторная лодка"
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "Лодка"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Мин. скорость (км/ч)"
@@ -19521,25 +19941,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "Макс. вес (тонны)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr "Макс. Высота (метры)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr "Макс. Ширина (метры)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr "Макс. Длина (метры)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "Круг"
@@ -19550,5 +19970,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "Править перекрёсток"
@@ -19568,10 +19988,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "проезжая часть"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr "съезд с дороги"
@@ -19593,10 +20013,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "автострада"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr "cъезд с автострады"
@@ -19618,10 +20038,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "главная дорога"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr "съезд с основной дороги"
@@ -19643,5 +20063,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -19656,9 +20076,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "дорога третьего порядка"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr "неклассифицированная дорога"
@@ -19672,9 +20092,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "дорога местного значения"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr "жилая улица"
@@ -19704,10 +20124,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "служебный проезд"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr "автобусный рельс"
@@ -19737,5 +20157,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -19747,10 +20167,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Править мост"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr "Править Тоннель"
@@ -19758,19 +20178,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Линии"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "Строительство"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "Править ремонтируемую дорогу"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "Перекрёсток"
@@ -19786,5 +20206,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "Круг"
@@ -19792,5 +20212,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr "Грунтовка"
@@ -19799,84 +20219,73 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr "Править грунтовку"
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "Грунтовка"
+msgstr "Дорожное покрытие"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "гравий"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr "тип1"
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "гравий"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr "тип2"
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "гравий"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr "тип3"
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "гравий"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr "тип4"
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "гравий"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr "тип5"
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
-msgstr ""
+msgstr "Шкала MTB"
 
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
-msgstr ""
+msgstr "Шкала SAC"
 
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr "туристический"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "Езда на горных велосипедах"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr "горный_туризм"
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
-msgstr "Продвинутый горный туризм"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr "горный_туризм_по_разрешению"
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
-msgstr "Альпийский туризм"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr "альпинизм"
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
-msgstr "Продвинутый альпийский туризм"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr "альпинизм_по_разрешению"
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
-msgstr "Сложный альпийский туризм"
+msgstr "сложный_альпинизм"
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "Тропа"
@@ -19885,12 +20294,32 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "Править тропу"
 
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr "превосходное"
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr "хорошее"
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr "нормальное"
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr "плохое"
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr "ужасное"
+
 #: build/trans_presets.java:489
-#, fuzzy
 msgid "Wheelchairs"
-msgstr "Кресло-каталка"
+msgstr "Инвалидные коляски"
 
 #: build/trans_presets.java:490
@@ -19906,7 +20335,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "Править дорогу для верховой езды"
+msgstr "Выделенная дорога для верховой езды"
 
 #. item "Ways/Dedicated Bridleway"
@@ -19919,7 +20347,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "Править велодорожку"
+msgstr "Выделенная велодорожка"
 
 #. item "Ways/Dedicated Cycleway"
@@ -19949,29 +20376,26 @@
 #: build/trans_presets.java:537
 msgid "Segregated Foot- and Cycleway"
-msgstr ""
+msgstr "Отделённые пешеходная и вело дорожки"
 
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "Объединить в любом случае"
+msgstr "Совмещённая пешеходная и вело дорожка"
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "Править тротуар"
+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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Править тротуар"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr "Велосипеды"
@@ -19979,5 +20403,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "Лестница"
@@ -19987,5 +20411,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Править лестницу"
@@ -19993,10 +20417,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr "Путевые точки"
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "Круговая развязка автомагистрали"
@@ -20004,15 +20428,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "Править круговую развязку автомагистрали"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "Номер"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "Службы"
@@ -20020,5 +20444,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr "Править службы"
@@ -20026,5 +20450,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -20057,17 +20482,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "Оператор"
@@ -20076,5 +20501,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "Светофор"
@@ -20084,5 +20509,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr "Тип пешеходного перехода"
@@ -20091,27 +20516,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr "неуправляемый"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr "светофор"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "остров"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr "необозначенный"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr "Перекрёсток на дороге для верховой езды"
@@ -20119,6 +20544,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr "Пересечение с велодорожкой"
@@ -20127,11 +20552,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr "Пересекая сопутствующие"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr "Имя типа пересечения (Великобритания)"
@@ -20139,30 +20564,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr "зебра"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr "пеликан"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr "тукан"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr "Тупик (птица)"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr "Пегас"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr "тигр"
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "Стоп"
@@ -20170,5 +20595,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr "Пешеходный переход"
@@ -20177,14 +20602,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr "Править перекрёсток"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr "Имя типа (UK)"
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr "Приспособление для ограничения скорости"
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr "Редактировать приспособление для ограничения скорости"
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr "Лежачий полицейский"
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr "Шикана"
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr "Сужение"
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr "Лежачий полицейский с разрывами"
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr "Широкий лежачий полицейский"
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr "Стол"
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr "Место проезда"
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr "Править место проезда"
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr "Мини-круг"
@@ -20195,14 +20666,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr "Направление"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr "по часовой стрелке"
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr "Круг для разворота"
@@ -20212,26 +20683,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "Граница населённого пункта"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "Править границу населённого пункта"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr "Второе название"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "Телефон первой необходимости"
@@ -20239,5 +20712,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr "Подъём"
@@ -20245,5 +20718,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr "Крутой подъём"
@@ -20251,11 +20724,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr "Брод"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr "Править брод"
@@ -20263,5 +20743,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr "Перевал"
@@ -20269,5 +20749,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr "Править перевал"
@@ -20279,7 +20759,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "Возвышение"
@@ -20287,5 +20767,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Преграды"
@@ -20293,5 +20773,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr "Столбик"
@@ -20299,5 +20779,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr "Править столбик"
@@ -20342,16 +20822,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "Разрешено движение:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr "Преграда для велосипедов"
@@ -20360,5 +20840,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr "Бетонный блок"
@@ -20366,5 +20846,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr "Забор препятствующий выходу скота с пастбища на дорогу"
@@ -20372,10 +20852,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr "Править Забор препятствующий выходу скота с пастбища на дорогу"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr "Автобусное место"
@@ -20383,15 +20863,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr "Шипы"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr "Править выступ"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "Оплата проезда"
@@ -20399,5 +20879,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "Править пункт оплаты проезда"
@@ -20405,10 +20885,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr "Пограничный контороль"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr "Править пограничный контороль"
@@ -20418,5 +20898,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr "Живая изгородь"
@@ -20425,12 +20905,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:817 build/trans_presets.java:819
 msgid "Fence"
 msgstr "Забор"
 
-#. item "Barriers/Fence"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr "Забор"
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr "Деревянный_забор"
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr "Проволочный забор"
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "Стена"
@@ -20438,5 +20930,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "Городская стена"
@@ -20445,5 +20937,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr "Подпорная стена"
@@ -20455,15 +20947,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr "Вход"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr "Править вход"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "Ворота"
@@ -20471,50 +20964,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr "Править ворота"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr "Шлагбаум"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr "Править шлагбаум"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr "Ворота Гэмпшир"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr "Править Ворота Гэмпшир"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr "Портовые ворота"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr "Править Портовые ворота"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr "Узкая калитка"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr "Править Узкую калитку"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr "Мостик"
@@ -20522,25 +21015,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr "Править мостик"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr "Турникет"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr "Править турникет"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr "Двойные ворота"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr "Править двойные ворота"
@@ -20551,11 +21044,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "Вода"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "Источник"
@@ -20563,5 +21056,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "Править источник"
@@ -20569,5 +21062,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr "Водосток"
@@ -20575,10 +21068,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr "Править водосток"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr "Ров"
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr "Править ров"
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "Ручей"
@@ -20586,10 +21090,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "Править ручей"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "Канал"
@@ -20597,10 +21101,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "Править канал"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "Река"
@@ -20610,5 +21114,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "Править реку"
@@ -20616,15 +21120,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Править воду"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "Суша"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "Править сушу"
@@ -20632,15 +21136,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr "Бассейн"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr "Править резервуар"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr "Резервуар"
@@ -20648,15 +21152,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr "Править резервуар"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr "Крытый резервуар"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr "Править крытый резервуар"
@@ -20664,5 +21168,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "Берег реки"
@@ -20671,10 +21175,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "Править берег реки"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr "Заболоченная территория"
@@ -20685,14 +21189,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr "Править заболоченная территория"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "болото"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr "трясина"
@@ -20706,35 +21210,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr "Болото"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr "плавни"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr "солевое болото"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr "ватты"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr "мангры"
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "Грязь"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr "Править грязь"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "Пляж"
@@ -20742,20 +21246,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "Править пляж"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "Бухта"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "Править бухту"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "Скала"
@@ -20763,10 +21267,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "Править скалу"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "Побережье"
@@ -20774,5 +21278,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "Править побережье"
@@ -20780,5 +21284,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "Паромная переправа"
@@ -20786,5 +21290,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr "Править переправу"
@@ -20793,5 +21297,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr "Лодочная мастерская"
@@ -20799,10 +21303,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr "Править лодочную мастерскую"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "Причал"
@@ -20810,5 +21314,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr "Править причал"
@@ -20816,5 +21320,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "Дамба"
@@ -20822,15 +21326,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "Править дамбу"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr "Гидротехнические сооружения"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr "Ворота шлюза"
@@ -20839,5 +21343,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr "Водослив"
@@ -20845,20 +21349,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr "Править водослив"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "Водопад"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "Править водопад"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr "Разворот"
@@ -20867,15 +21371,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr "Пристань для яхт"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr "Править пристань для яхт"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "Пирс"
@@ -20883,10 +21387,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "Править пирс"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr "Паромная станция"
@@ -20894,10 +21398,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr "Править паромную станцию"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr "Слип"
@@ -20907,20 +21411,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr "Править слип"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr "Транспорт"
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "Железная дорога"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "Железная дорога"
@@ -20928,5 +21432,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr "Править железную дорогу"
@@ -20935,139 +21439,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr "Колёсная база (мм)"
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr "стандартный"
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr "парк"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr "запасный путь"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr "ответвление"
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr "железная дорога"
+
+#. item "Man Made/Power Line" text "Line reference"
+#. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
+#: build/trans_presets.java:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr "Частота (Гц)"
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr "16.7"
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr "Узкоколейка"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr "Править узкоколейку"
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr "Монорельс"
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr "Править монорельс"
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr "Историческая"
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr "Править узкоколейку"
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr "Лёгкая железная дорога"
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr "Править лёгкую железную дорогу"
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "Метрополитен"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "Править метрополитен"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "Трамвай"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr "Править трамвай"
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr "Автобусные рельсы"
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr "Править автобусные рельсы"
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "Неиспользуемая"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "Править неиспользуемые железнодорожные пути"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr "Необязательные типы"
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr "парк"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr "запасный путь"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr "ответвление"
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr "Узкоколейка"
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr "Править узкоколейку"
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr "Монорельс"
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr "Править монорельс"
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr "Историческая"
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr "Править узкоколейку"
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr "Лёгкая железная дорога"
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr "Править лёгкую железную дорогу"
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "Метрополитен"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "Править метрополитен"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "Трамвай"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr "Править трамвай"
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr "Автобусные рельсы"
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr "Править автобусные рельсы"
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "Неиспользуемая"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "Править неиспользуемые железнодорожные пути"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "Заброшенная"
@@ -21076,5 +21819,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr "Переезд"
@@ -21083,5 +21826,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr "Пересечение"
@@ -21091,5 +21834,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr "Тип пересечения"
@@ -21097,5 +21840,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "Поворотный стол"
@@ -21104,10 +21847,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr "Канатная дорога"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "Кресельная дорога"
@@ -21115,10 +21865,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr "Править кресельную дорогу"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr "Бугельный подъёмник"
@@ -21126,10 +21876,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr "Править бугельный подъёмник"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "Канатная дорога"
@@ -21137,10 +21887,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "Править канатную дорогу"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr "Гондола"
@@ -21148,10 +21898,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr "Править Гондолу"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -21159,12 +21909,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr "Править станцию"
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr "Пилон"
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr "Править пилон"
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "Заправочная станция"
@@ -21174,9 +21937,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Править заправку"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr "Agip"
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr "Aral"
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr "Avia"
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr "BP"
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr "Esso"
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr "OMV"
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr "Q8"
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr "Repsol"
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr "Shell"
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr "Statoil"
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr "Tamoil"
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr "Texaco"
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr "Total"
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr "Indipend."
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -21230,32 +22050,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "Часы работы"
@@ -21314,94 +22134,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Пн-Пт 08:30-20:00"
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
-msgstr "Вт-Вс 08:00-15:00; Sa 08:00-12:00"
-
+msgstr "Вт-Вс 08:00-15:00; Вс 08:00-12:00"
+
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr "Типы топлива:"
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr "Дизельное"
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr "Дизельное био"
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr "Дизель (сжиженый из газа)"
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr "Дизельное для тяжёлого транспорта"
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr "Октан. 91"
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr "Октан. 95"
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr "Октан. 98"
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr "Октан. 100"
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr "E10 (10% смесь этанола)"
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr "E85 (85% смесь этанола)"
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr "LPG (Сжиженые пары бензина)"
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr "CNG (Сжатый природный газ)"
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr "1/25 mix (mofa/moped)"
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr "1/50 mix (mofa/moped)"
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -21413,5 +22309,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -21421,5 +22317,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Править стоянку"
@@ -21430,25 +22326,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr "Справочный номер"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "многоуровневая"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "наземная"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr "подземная"
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr "Перехватывающая парковка"
@@ -21457,28 +22353,28 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "Денежный сбор"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr "Вместимость (общая)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr "Места для инвалидов"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr "Места для женщин"
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr "Места для родителей"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
@@ -21486,20 +22382,20 @@
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "Мойка"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "Править автомойку"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "Мастерская"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "Править автомастерскую"
@@ -21507,5 +22403,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "Прокат"
@@ -21514,10 +22410,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "Править прокат авто"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr "Совместное использование"
@@ -21525,5 +22421,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr "Править совместное использование"
@@ -21531,10 +22427,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "Править стоянку для велосипедов"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr "Вместимость"
@@ -21543,15 +22439,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "Править прокат велосипедов"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Общественный транспорт"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -21561,5 +22457,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -21567,5 +22463,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr "UIC-Справка"
@@ -21573,5 +22469,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr "Полустанок"
@@ -21579,5 +22475,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr "Править полустанок"
@@ -21585,5 +22481,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "Трамвайная остановка"
@@ -21592,5 +22488,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "Править трамвайную остановку"
@@ -21598,5 +22494,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "Ж/Д платформа"
@@ -21605,5 +22501,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "Править ж/д платформу"
@@ -21615,5 +22511,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr "Табличка (номер платформы)"
@@ -21621,10 +22517,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr "Полигон"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "Вход в метро"
@@ -21633,10 +22529,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "Править вход в метро"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr "Кресло-каталка"
@@ -21645,5 +22541,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "Автовокзал"
@@ -21652,5 +22548,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "Править автовокзал"
@@ -21658,5 +22554,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "Автобусная остановка"
@@ -21666,5 +22562,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "Править автобусную остановку"
@@ -21673,25 +22569,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr "Навес"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "Скамейка"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr "Тактильное мощение"
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr "Автобусная платформа"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr "Править автобусную платформу"
@@ -21699,5 +22596,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "Такси"
@@ -21705,5 +22602,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "Править стоянку такси"
@@ -21711,32 +22608,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "Аэропорт"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr "Наземный аэродром"
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr "Править Аэродром"
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr "Править наземный аэродром"
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr "Международная ассоциация воздушного транспорта"
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr "Международная организация гражданской авиации"
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr "Взлётно-посадочная полоса"
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr "Править взлётно-посадочную полосу"
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr "Рулёжная дорожка"
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr "Править рулёжную дорожку"
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr "Вертолётная площадка"
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr "Указатель силы ветра"
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr "Терминал"
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr "Править терминал"
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr "Править выход терминала (к самолёту)"
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr "Путешествие"
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Проживание"
@@ -21748,5 +22740,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Гостиница"
@@ -21755,15 +22747,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "Править Гостиницу"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "Звёзды"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr "Мотель"
@@ -21771,20 +22763,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr "Править Мотель"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr "Домик для гостей"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr "Править Домик для гостей"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "Шале"
@@ -21792,10 +22784,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr "Править Шале"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr "Общежитие"
@@ -21803,30 +22795,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr "Править общежитие"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr "Альпийская хижина"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr "Править Альпийскую хижину"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr "Стоянка фургонов"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr "Править стоянку фургонов"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "Кэмпинг"
@@ -21834,10 +22826,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr "Править Кемпинг"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Еда+Напитки"
@@ -21848,5 +22840,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ресторан"
@@ -21854,5 +22846,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "Править Ресторан"
@@ -21860,5 +22852,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr "Кухня"
@@ -21866,61 +22858,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "итальянская"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "китайская"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "пицца"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "бутерброды"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "греческая"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "немецкая"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "индийская"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "местная"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr "шашлык"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "турецкая"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "азиатская"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "тайская"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "мексиканская"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "японская"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr "Французский"
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr "сендвич"
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr "суши"
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "Фастфуд"
@@ -21928,9 +22932,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "Править Ресторан фастфуда"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr "рыба_и_чипсы"
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr "курятина"
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "Кафе"
@@ -21938,9 +22950,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "Править Кафе"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "Пивной бар"
@@ -21948,18 +22960,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "Править Пивной бар"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr "Пивной сад"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr "Править Пивной сад"
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr "Бар"
@@ -21967,9 +22979,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr "Править Бар"
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "Ночной клуб"
@@ -21977,24 +22989,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "Править Ночной клуб"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Туризм"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr "Достопримечательность"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr "Править Достопримечательность"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Музей"
@@ -22002,9 +23014,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Править Музей"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Зоопарк"
@@ -22013,9 +23025,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Править Зоопарк"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "Смотровая площадка"
@@ -22023,24 +23035,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "Править Смотровую площадку"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr "Каланча"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "Парк развлечений"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr "Править Парк развлечений"
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "Рисунки"
@@ -22048,5 +23060,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "Править Картинную галлерею"
@@ -22054,19 +23066,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr "Справочное бюро"
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Карта"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr "Уровень детализации"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr "топографический"
@@ -22104,5 +23116,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -22110,28 +23122,28 @@
 msgstr "улица"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr "схема"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr "Показанная область"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr "место"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr "город"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr "регион"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr "Ближайшее описание"
@@ -22141,5 +23153,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr "Маршруты показаны для:"
@@ -22147,5 +23159,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr "Туризм"
@@ -22153,6 +23165,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "Велоспорт"
@@ -22160,5 +23172,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr "Езда на горных велосипедах"
@@ -22166,6 +23178,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "Лыжный спорт"
@@ -22173,5 +23185,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr "Катание"
@@ -22179,46 +23191,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr "... другие возможные способы передвижения"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr "Информационный стенд"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr "Содержимое указателя"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr "указатель"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "история"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr "природа"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr "животный мир"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr "растения"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
-msgstr "Пост проводника"
+msgstr "Указатель направления"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr "Информационная стойка"
@@ -22226,29 +23238,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr "Примерное описание"
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr "Аудиогид"
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr "Аудиогид через мобильный телефон?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr "Номер телефона"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr "Другие справочные бюро"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr "Править Навес"
@@ -22256,25 +23268,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr "Очаг"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "Место для пикника"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "Править Место для пикника"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Исторические места"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Замок"
@@ -22283,19 +23295,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Править Замок"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Руины"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Править Руины"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Место раскопок"
@@ -22304,9 +23316,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "Править Место раскопок"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "Поле битвы"
@@ -22314,10 +23326,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "Править Поле битвы"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr "Место раскопок"
@@ -22325,5 +23337,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr "Править место раскопок"
@@ -22331,15 +23343,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "Памятник"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "Править Памятник"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "Мемориал"
@@ -22347,55 +23359,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "Править Мемориал"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr "Придорожный крест"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr "Править придорожный крест"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr "Придорожная святыня"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr "Править придорожную святыню"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr "Пограничный камень"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr "Править Пограничный камень"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Досуг"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "Править Аквапарк"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Игровая площадка"
@@ -22403,35 +23415,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Править Игровую площадку"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Рыбалка"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "Править Место для рыбалки"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr "Спорт"
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr "Спортивные учреждения"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Стадион"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Править Стадион"
@@ -22445,6 +23457,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "вид спорта:"
@@ -22836,6 +23848,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -22869,225 +23881,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr "несколько"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "стрельба из лука"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr "атлетика"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "австралийский футбол"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "бейсбол"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "баскетбол"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr "бочче"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr "боулз"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr "каноэ"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "альпинизм"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr "крикет"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr "крикет_сеть"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr "крокет"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "велоспорт"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr "собачьи бега"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr "наездник"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "футбол"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "гольф"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "гимнастика"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "хоккей"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr "лошадиные бега"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr "машина"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr "пелота"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr "теннис"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr "рэгби"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "стрельба"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr "скейтборд"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr "фигурное катание"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "лыжный спорт"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "футбол"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "плавание"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "настольный теннис"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "теннис"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "Спортивный центр"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "Править спортивный центр"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr "Спортивное поле"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr "Править спортивное поле"
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr "Трек"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr "Править трек"
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "Поле для гольфа"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "Править Поле для гольфа"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "Минигольф"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "Править Минигольф"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Спорт"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
-msgstr "Несколько"
+msgstr "Многоборье"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr "Править Многоборье"
@@ -23126,21 +24138,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "тип"
@@ -23179,203 +24191,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr "спортивное поле"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "спортивный центр"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "стадион"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr "трек"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr "Кегельбан"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr "Править Кегельбан"
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr "Править Атлетику"
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "Стрельба из лука"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "Править Стрельбу из лука"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "Скалолазанье"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "Править Скалолазанье"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr "Каноэ"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr "Править Каноэ"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr "Править Велоспорт"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "Собачьи бега"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr "Править Собачьи бега"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
-msgstr "Наездник"
+msgstr "Конный спорт"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
-msgstr "Править Наездника"
-
-#: build/trans_presets.java:1850
+msgstr "Править конный спорт"
+
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr "Лошадиные бега"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr "Править лошадиные бега"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "Гимнастика"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr "Править Гимнастику"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "Моторные виды спорта"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr "Править моторные виды спорта"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr "Фигурное катание"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr "Править Фигурное катание"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr "Скейтборд"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr "Править Скейтборд"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "Плавание"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "Править Плавание"
@@ -23383,56 +24395,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr "Править Лыжный сопрт"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr "Тип лыжни"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr "горнолыжный спуск"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr "беговые_лыжи"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr "снежный_парк"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr "Сложность"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr "новичок"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr "лёгкий"
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr "нормальный"
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr "усложнённый"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr "эксперт"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr "произвольный"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "Стрельба"
@@ -23440,182 +24448,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "Править Тир"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "Спорт (с мячом)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "Футбол"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr "Править Футбол"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "Американский футбол"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr "Править Американский футбол"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr "Австралийский футбол"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr "Править Австралийский футбол"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr "Править Бейсбол"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "Править Баскетбол"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "Гольф"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr "Править Гольф"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "поле для гольфа"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr "Бочче"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr "Править Бочче"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr "Боулз"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr "Править Боулз"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr "Крикет"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr "Править Крикет"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
-msgstr "Сети крикета"
+msgstr "Корты для крикета"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
-msgstr "Править Сети крикета"
-
-#: build/trans_presets.java:1964
+msgstr "Править корты для крикета"
+
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr "Крокет"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr "Править Крокет"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "Хоккей"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "Править Хоккей"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr "Пелота"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr "Править Пелота"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr "Теннис"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr "Править Теннис"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "Регби"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr "Править рэгби"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "Настольный теннис"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "Править Настольный теннис"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "Теннис"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "Править Теннис"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr "Рукотворное"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Здания"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "Здание"
@@ -23623,5 +24631,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Общественное здание"
@@ -23629,10 +24637,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Править Общественное здание"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "Муниципалитет"
@@ -23640,10 +24648,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Править здание муниципалитета"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Посольство"
@@ -23651,10 +24659,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Править посольство"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "Здание суда"
@@ -23663,10 +24671,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Править здание суда"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Тюрьма"
@@ -23675,10 +24683,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Править Тюрьму"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Полиция/Милиция"
@@ -23688,10 +24696,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Править Полицию"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "Пожарное депо"
@@ -23700,10 +24708,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Править Пожарное депо"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Почтовое отделение"
@@ -23711,5 +24719,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Править Почтовое отделение"
@@ -23717,15 +24725,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "Детский сад"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "Править Детсад"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "Школа"
@@ -23733,10 +24741,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "Править Школу"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "Университет"
@@ -23744,10 +24752,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "Править Университет"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "Колледж"
@@ -23755,5 +24763,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "Править Колледж"
@@ -23761,5 +24769,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Кинотеатр"
@@ -23768,10 +24776,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Править Кинотеатр"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "Библиотека"
@@ -23780,9 +24788,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Править Библиотеку"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "Центр искусств"
@@ -23790,10 +24798,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "Править центр искусств"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Театр"
@@ -23802,10 +24810,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Править Театр"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "Место поклонения"
@@ -23815,5 +24823,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "Править Место поклонения"
@@ -23822,6 +24830,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "Религия"
@@ -23830,66 +24838,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr "Бахаи"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "Буддизм"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "Христианство"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "Индуизм"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr "Джайнизм"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "Иудаизм"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "Мусульманство"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr "сикхизм"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr "Спиритуализм"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr "Даосизм"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr "унитарный"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr "зороастризм"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr "Конфессия"
@@ -23898,81 +24906,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr "Англиканская"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "Баптизм"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "Католическая"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr "Евангельская"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr "Свидетели Иеговы"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "Лютеранство"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr "Методизм"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr "Мормон"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "Православие"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr "пятидесятник"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr "пресвитерианин"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "Протестантизм"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr "квакер"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr "шиизм"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr "суннизм"
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Адреса"
@@ -23981,5 +24989,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Править адреса"
@@ -23987,5 +24995,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "Номер дома"
@@ -23993,25 +25001,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "Название дома"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Название улицы"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "Название города"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Почтовый индекс"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "Код страны"
@@ -24020,5 +25028,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "Править интерполяцию адресов"
@@ -24026,61 +25034,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr "Схема нумерации"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "нечётные"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "чётные"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr "алфавитный"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr "Рукотворное"
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "Цеха"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "Править Чеха"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Башня"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Править Башню"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr "Тип вышки"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr "связная"
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr "наблюдательная"
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr "Высота (в метрах)"
@@ -24088,25 +25096,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Водонапорная башня"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Править Водонапорную башню"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "Газгольдер"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "Править Газгольдер"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "Маяк"
@@ -24114,10 +25122,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Править Маяк"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Ветряная мельница"
@@ -24125,10 +25133,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Править Ветряную мельницу"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Трубопровод"
@@ -24137,37 +25145,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Править Трубопровод"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
+msgid "gas"
+msgstr "газ"
+
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr "для нагрева воды"
+
+#: build/trans_presets.java:2353
 msgid "oil"
 msgstr "нефтяная"
 
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-msgid "gas"
-msgstr "газ"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr "канализационная"
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr "для нагрева воды"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr "любого назначения"
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr "подводная"
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr "надземная"
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "Очистные сооружения"
@@ -24177,10 +25185,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "Править Очистные сооружения"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Кран"
@@ -24188,21 +25196,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Править Кран"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr "Буй"
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr "Править Буй"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "Точка наблюдений"
@@ -24210,10 +25213,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "Править точку наблюдений"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "Видеонаблюдение"
@@ -24221,11 +25224,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Править Видеонаблюдение"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr "не на вынос"
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr "на вынос"
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr "общедоступное"
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "Электростанция"
@@ -24235,35 +25250,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "Править Электростанцию"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "энергия ветра"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "энергия воды"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "энергия сгорания топлива"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "атомный"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "уголь"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr "солнечная батарея"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "Электроподстанция"
@@ -24272,10 +25287,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "Править электроподстанцию"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "Трансформаторная будка"
@@ -24284,5 +25299,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "Править трансформатор"
@@ -24290,10 +25305,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr "электролиния"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "Опора ЛЭП"
@@ -24304,23 +25319,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "Править Опору ЛЭП"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr "вышка"
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr "столб"
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr "Ссылка вышки"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "Линия электропередач"
@@ -24329,79 +25344,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "Править линию электропередач"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr "Тип линии"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr "линия"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr "minor_line"
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "Напряжение"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr "Напряжение на кабелях"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr "одножильный"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr "двухжильный"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr "трёхжильный"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr "четырёхжильный"
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr "Удобства"
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Туалеты"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr "ограничено"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr "Примечание"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "Почтовый ящик"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Телефон"
@@ -24410,5 +25420,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Править телефон"
@@ -24416,5 +25426,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Монеты"
@@ -24422,5 +25432,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "Банкноты"
@@ -24428,5 +25438,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr "Электронные средства оплаты"
@@ -24434,5 +25444,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr "Дебитные карты"
@@ -24440,15 +25450,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Кредитные карты"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Телефонные карты"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Переработка отходов"
@@ -24457,5 +25467,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Править переработку отходов"
@@ -24463,63 +25473,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "Батарейки"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "Консервные банки"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "Одежда"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "Стекло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "Бумага"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "Металлолом"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr "Урна для мусора"
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+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:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr "Кресло"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr "Материал"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr "камень"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr "пластик"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr "Цвет"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr "чёрный"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr "коричневый"
@@ -24598,5 +25619,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -24606,31 +25627,31 @@
 msgstr "зеленый"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr "красный"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr "синий"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr "серый"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr "белый"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr "Крепление сидений"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr "Охотничий стенд"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr "Править охотничий стенд"
@@ -24639,30 +25660,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "Высота"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr "низкий"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr "средний"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr "полный"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr "Укрытие"
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr "Заблокирован"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "Фонтан"
@@ -24671,10 +25692,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "Править фонтан"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "Питьевая вода"
@@ -24683,10 +25704,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Править Источник воды"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr "Править пожарный кран"
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr "Детская комната"
@@ -24694,15 +25728,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr "Править Детскую комнату"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Магазины"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr "Автомагазин"
@@ -24710,10 +25744,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "Править автомагазин"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr "Веломагазин"
@@ -24722,28 +25756,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "Править веломагазин"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "Править Супермаркет"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr "Аптека"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr "Править Аптеку"
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr "Продуктовый магазин"
@@ -24751,9 +25785,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr "Править продуктовый магазин"
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "Киоск"
@@ -24761,27 +25795,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "Править Киоск"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr "Книжный магазин"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr "Править книжный магазин"
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr "Туристическое агенство"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr "Править Турбюро"
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "Торговый автомат"
@@ -24789,5 +25823,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "Править торговый автомат"
@@ -24795,88 +25829,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "Реализуемая продукция"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr "билеты на общественный транспорт"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr "план общественного транспорта"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr "билеты на парковку"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "еда"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "напитки"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "сладости"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "сигареты"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "фотографии"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "еда для животных"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "газеты"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "игрушки"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "марки"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "SIM-карты"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr "телефонные ваучеры"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr "ваучеры"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "презервативы"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr "тампоны"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr "пакеты для экскрементов"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr "Счета или карты лояльности"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "Мясная лавка"
@@ -24884,9 +25918,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Править Мясную лавку"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "Булочная"
@@ -24894,9 +25928,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Править Булочную"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "Флорист"
@@ -24904,18 +25938,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "Править Цветочный магазин"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr "Цветочный"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr "Править Зоотовары"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr "Алкоголь"
@@ -24923,54 +25957,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr "Править Магазин алкогольной продукции"
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr "Напитки"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr "Править Магазин напитков"
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr "Компьютер"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "Править Магазин компьютеров"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr "Электроника"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "Редактировать Магазин электронной техники"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr "Звуковая аппаратура"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr "Править Магазин звуковой аппаратуры"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr "Мебельный"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "Править мебельный магазин"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr "Садовый магазин"
@@ -24978,9 +26012,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr "Править Садовый магазин"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr "Оборудование"
@@ -24988,9 +26022,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr "Править Магазин оборудования"
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "Строительный магазин"
@@ -24998,54 +26032,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "Править строительный магазин"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr "Канцтовары"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr "Править Магазин канцтоваров"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "Парикмахерская"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "Править парихмахерскую"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr "Обувь"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "Править Обувной магазин"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr "Игрушки"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "Править Магазин игрушек"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr "Видео"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr "Править Магазин видеозаписей"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Химчистка"
@@ -25053,9 +26087,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Править Химчистку"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Прачечная"
@@ -25063,9 +26097,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Править Прачечную"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr "Товары для активного отдыха"
@@ -25073,28 +26107,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr "Править магазин товаров для активного отдыха"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr "Править Спортивный магазин"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
-msgstr "Оптик"
+msgstr "Оптика"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "Править оптику"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Наличные"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Банк"
@@ -25102,14 +26136,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Править Банк"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "Банкомат"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Обмен валют"
@@ -25117,5 +26151,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Править Обмен валют"
@@ -25123,15 +26157,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Править Банкомат"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Здоровье"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "Врач"
@@ -25139,18 +26173,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "Править врача"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "Стоматолог"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "Править стоматологию"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -25158,5 +26192,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Править Аптеку"
@@ -25164,9 +26198,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr "Отпуск лекарств по рецептам"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Больница"
@@ -25174,10 +26208,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Править Больницу"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr "Пункт вызова экстренной помощи"
@@ -25186,5 +26220,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr "Править Пункт вызова экстренной помощи"
@@ -25193,20 +26227,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr "Номер пункта"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr "Название точки"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "Номер телефона"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Используйте международный код, например: +7-916-0857403)"
@@ -25214,5 +26248,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "Ветеринар"
@@ -25221,64 +26255,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "Править ветеринара"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr "География"
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Места"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Континент"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Править континент"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "Страна"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Править Страну"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "Штат"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "Править Штат"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "Область"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "Править Область"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr "Графство"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr "Править Графство"
@@ -25286,15 +26320,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "Город (более 100 000)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "Править Город"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "Город (до 100 000)"
@@ -25302,10 +26336,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "Править город"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "Пригород"
@@ -25313,25 +26347,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "Править Пригород"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Село"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Править Село"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "Деревня"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "Править деревню"
@@ -25339,5 +26373,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr "Местность"
@@ -25345,10 +26379,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr "Править Местность"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "Остров"
@@ -25356,10 +26390,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Править Остров"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr "Островок"
@@ -25367,5 +26401,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr "Править Островок"
@@ -25373,5 +26407,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "Вход в пещеру"
@@ -25379,10 +26413,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "Править Вход в пещеру"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Вершина"
@@ -25390,10 +26424,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Править Вершину"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "Ледник"
@@ -25401,10 +26435,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "Править Ледник"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "Вулкан"
@@ -25412,70 +26446,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "Править Вулкан"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Границы"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "Государственная"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "Править Государственную границу"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "Административная"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "Править Административную границу"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr "Гражданская"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr "Править Гражданскую границу"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr "Политическая"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "Править Политическую границу"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr "Национальный парк"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "Править национальный парк"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Землепользование"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Дерево"
@@ -25484,15 +26518,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Править дерево"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "Научное название"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "Лесистая местность"
@@ -25501,5 +26535,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "Править лесистую местность"
@@ -25507,17 +26541,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "Хвойный"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "Лиственный"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "Смешанный"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "Лес"
@@ -25526,14 +26560,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "Править Лес"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "Заповедник"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "Править Заповедник"
@@ -25541,25 +26575,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr "Каменистая осыпь"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr "Править Каменистую осыпь"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr "Кустарник"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr "Править Кустарник"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr "Вырубленный лес"
@@ -25567,10 +26601,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr "Править Вырубленный лес"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr "Пустошь"
@@ -25578,5 +26612,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "Править Пустырь"
@@ -25584,5 +26618,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr "Двор фермы"
@@ -25591,45 +26625,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr "Править Двор фермы"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "Обрабатываемая земля"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr "Править обрабатываемую землю"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr "Луг"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr "Править Луг"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "Виноградник"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "Править Виноградник"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr "Огороды"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr "Править Сады-огороды"
@@ -25637,25 +26671,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "Сад"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "Править Сад"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "Трава"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr "Править Лужайку"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr "Площадка для праздников"
@@ -25663,10 +26697,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr "Править Площадку для праздников"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr "Общее"
@@ -25674,20 +26708,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr "Править Общественные земли"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "Парк"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "Править Парк"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr "Спортплощадка"
@@ -25695,5 +26729,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr "Править Спортплощадку"
@@ -25701,15 +26735,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "Жилая зона"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr "Править Жилую зону"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "Церковное кладбище"
@@ -25717,9 +26751,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Править церковное кладбище"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "Кладбище"
@@ -25727,39 +26761,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "Править Кладбище"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "Розничная торговля"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr "Править розничную торговлю"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "Коммерция"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr "Править Офисный район"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "Промышленность"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr "Править Промышленный район"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr "Территории железных дорог"
@@ -25767,15 +26801,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr "Править Территорию железных дорог"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "Военное"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr "Править Военную зону"
@@ -25783,50 +26817,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "Стройплощадка"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "Править Стройплощадку"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr "Пустырь с развалинами"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr "Править пустырь с развалинами"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr "Пустырь"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr "Править пустырь"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr "Свалка"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr "Править свалку"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "Карьер"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "Править карьер"
@@ -25836,5 +26870,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr "Править область с вложениями"
@@ -25843,10 +26877,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr "внешний сегмент"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr "внутренний сегмент"
@@ -25854,5 +26888,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr "Ограничение на поворот"
@@ -25861,5 +26895,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr "Править ограничение на поворот"
@@ -25867,34 +26901,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr "Ограничение"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr "поворот налево запрещён"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr "поворот направо запрещён"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr "движение прямо запрещено"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr "разворот запрещён"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr "движение только направо"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr "движение только налево"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr "движение только прямо"
@@ -25903,15 +26937,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr "от линии"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr "через точку или линию"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr "до линии"
@@ -25919,5 +26953,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr "Маршрут"
@@ -25926,5 +26960,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr "Править маршрут"
@@ -25932,5 +26966,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr "Тип маршрута"
@@ -26021,5 +27055,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -26029,17 +27063,17 @@
 msgstr "велосипедный"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr "автобусный"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr "трасса"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr "паромный"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr "лыжный"
@@ -26099,5 +27133,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -26106,9 +27140,9 @@
 msgstr "пеший"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr "трамвайный"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr "объездной"
@@ -26122,10 +27156,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "линия метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr "Описание символа"
@@ -26133,31 +27167,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr "Сеть"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr "Состояние маршрута"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr "планируемый"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr "альтернативный"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr "временный"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr "соединяющий"
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr "Цвет (hex)"
@@ -26166,107 +27200,32 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr "сегмент маршрута"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr "сегмент вперёд"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr "сегмент назад"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr "конечная точка"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr "конечная вперёд"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 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"
@@ -26802,77 +27761,4 @@
 msgid "highway_track"
 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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
-msgstr "железная дорога"
 
 #. color rail
@@ -27260,7 +28146,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "Баптизм"
+msgstr "Водные пороги"
 
 #. color manmade
@@ -27586,5 +28471,5 @@
 #: build/trans_style.java:1451 build/trans_style.java:1452
 msgid "piste_advanced"
-msgstr "продвинутая_лыжня"
+msgstr "усложнённая_лыжня"
 
 #. color piste_advanced
@@ -27599,5 +28484,5 @@
 #: build/trans_style.java:1460 build/trans_style.java:1461
 msgid "piste_expert"
-msgstr "сложная_лыжня"
+msgstr "очень_сложная_лыжня"
 
 #. color piste_expert
@@ -30280,10 +31165,10 @@
 #: build/trans_wms.java:5
 msgid "Landsat"
-msgstr "Landsat"
+msgstr "Подложка Landsat"
 
 #. http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&layers=global_mosaic&styles=&format=image/jpeg&
 #: build/trans_wms.java:6
 msgid "Open Aerial Map"
-msgstr "OpenAerialMap"
+msgstr "Подложка Aerial Map"
 
 #. http://openaerialmap.org/wms/?VERSION=1.0&request=GetMap&layers=world&styles=&format=image/jpeg&
@@ -30293,5 +31178,5 @@
 #: build/trans_wms.java:10
 msgid "Yahoo Sat"
-msgstr "Yahoo Sat"
+msgstr "Подложка Yahoo Sat"
 
 #. html:http://josm.openstreetmap.de/wmsplugin/YahooDirect.html?
@@ -30399,222 +31284,4 @@
 msgid "Sicily - Italy"
 msgstr "Sicily - Италия"
-
-#~ msgid "The plugin could not be removed. Probably it was already disabled"
-#~ msgstr "Не удается удалить модуль. Возможно он уже выключен"
-
-#~ msgid "Bridleway"
-#~ msgstr "Дорога для верховой езды"
-
-#~ msgid "Cycleway"
-#~ msgstr "Велодорожка"
-
-#~ msgid "Footway"
-#~ msgstr "Тротуар"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Грунтовка 1 класса"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Править грунтовку 1 класса"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Грунтовка 2 класса"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Править грунтовку 2 класса"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Грунтовка 3 класса"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Править грунтовку 3 класса"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Грунтовка 4 класса"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Править грунтовку 4 класса"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Грунтовка 5 класса"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Править грунтовку 5 класса"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Править туризм"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "Горный туризм"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Править горный туризм"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Править продвинутый горный туризм"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Править альпийский туризм"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Править продвинутый альпийский туризм"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Править сложный альпийский туризм"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "Требуется id > 0, получено {0}"
-
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "Параметр ''{0}'' не должен быть пустым"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "параметр ''{0}'' не должен быть null"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "ожидался экземпляр OsmDataLayer или GpxLayer. Получен ''{0}''."
-
-#~ msgid ""
-#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
-#~ "This can lead to nodes being deleted accidentally.\n"
-#~ "Are you really sure to continue?"
-#~ msgstr ""
-#~ "Выделенные линии содержат точки, находящиеся за пределами\n"
-#~ "скачанной области. Некоторые точки могут быть случайно\n"
-#~ "удалены. Вы действительно хотите продолжить?"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Невозможно вернуть команду ''{0}'' потому что слоя ''{1}'' больше нет"
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "Параметр ''{0}'' не должен быть пустым"
-
-#~ msgid "Expected array of length 4, got {0}"
-#~ msgstr "Ожидаемая длина массива 4, получено {0}"
-
-#~ msgid "Exactly four doubles excpected in string, got {0}"
-#~ msgstr "Только четыре дубля ожидалось в строке, получено {0}"
-
-#~ msgid "Illegal double value ''{0}''"
-#~ msgstr "Неверное значение дубля ''{0}''"
-
-#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
-#~ msgstr "Ожидался параметр ''{0}'' > 0.0, получено {1}"
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "обнаружен id >= 0. Получено {0}"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
-#~ msgstr "Ожидался параметр ''{0}'' >= 0, получено {1}"
-
-#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-#~ msgstr "параметр ''{0}'' - имя недопустимого типа, получен ''{1}''"
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "параметр ''{0}'' - недопустимый класс, получен ''{1}''"
-
-#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
-#~ msgstr "Ожидался параметр ''{0}'' > 0, получено {1}"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr ""
-#~ "параметр ''{0}'' должен быть в интервале 0..{1}, текущее значение {2}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "требуется параметр ''{0}'' > 0. Получен {1}"
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr ""
-#~ "текущее значение параметра вне допустимой области: текущее значение {0}"
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "Неожиданный индекс столбца. Получено {0}."
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "Параметр 'col' должен быть 0 или 1. Текущее значение {0}"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "параметр ''{0}'' не должен быть пустым"
-
-#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
-#~ msgstr ""
-#~ "Ожидался параметр ''{0}'' с тегами для определённого ключа. Получено {1}."
-
-#~ msgid "Dialog not created yet. Invoke createInstance() first"
-#~ msgstr "Диалог ещё не создан. Сначала используйте createInstance()"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Open"
-#~ msgstr "Открыть"
-
-#~ msgctxt "changeset.open"
-#~ msgid "Closed"
-#~ msgstr "Закрыто"
-
-#~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
-#~ msgstr "Ожидаемое значение цело > 0 для параметра ''{0}'', получено ''{1}''"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Конфликт в данных"
-
-#~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
-#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
-#~ "the new role?</html>"
-#~ msgstr ""
-#~ "<html>Вы назначили пустую роль на {0} элем .<br>Это эквивалентно удалению "
-#~ "ролей из этих элементов.<br>Вы действительно хотите назначить новую роль?"
-#~ "</html>"
-
-#~ msgid "Value of child.getId() > 0 expected. Got {1}."
-#~ msgstr "Ожидалось значение child.getId() > 0. Получено {1}."
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
-#~ msgstr "Ожидался параметр ''{0}'' > 0. Получено {1}."
-
-#~ msgid "id in parameter ''{0}'' > 0 expected, got {1}."
-#~ msgstr "ожидался id in parameter ''{0}'' > 0, получено {1}."
-
-#~ msgid "Object id > 0 expected. Got {0}"
-#~ msgstr "Ожидался объект с id > 0 . Получено {0}"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "изображение"
-#~ msgstr[1] "изображения"
-#~ msgstr[2] "изображений"
-
-#~ msgid "Illegal value for attribute ''uid''. Got ''{0}''."
-#~ msgstr "Неверное значение для атрибута ''uid''. Получено''{0}''."
-
-#~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-#~ msgstr "Ожидался экземпляр OsmDataLayer. Получено ''{0}''."
-
-#~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "требуется параметр id ''{0}'' > 0. Получен {1}"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-#~ msgstr "ожидался параметр ''{0}'' >= 0, текущее значение ''{1}''"
-
-#~ msgid "Expected value > 0 for parameter ''{0}'', got {1}"
-#~ msgstr "Ожидалось значение > 0 для параметра ''{0}'', получено {1}"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "Модуль {0} требует обновить JOSM до версии {1}."
-
-#~ msgid "<html>"
-#~ msgstr "<html>"
-
-#~ msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}"
-#~ msgstr ""
-#~ "Ожидалось значение типа long > 0 для параметра ''{0}'', получено {1}"
-
-#~ msgid "Parameter ''{0}'' of type node expected, got ''{1}''"
-#~ msgstr "Ожидался параметр ''{0}'' типа точки , получен ''{1}''"
 
 #~ msgid "No data imported."
@@ -30741,4 +31408,10 @@
 #~ msgid "GPS end: {0}"
 #~ msgstr "Конец GPS: {0}"
+
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "изображение"
+#~ msgstr[1] "изображения"
+#~ msgstr[2] "изображений"
 
 #~ msgid "timezone difference: "
@@ -30852,6 +31525,30 @@
 #~ msgstr "Все изображения"
 
-#~ msgid "Station"
-#~ msgstr "Станция"
+#~ msgid "Boat"
+#~ msgstr "Лодка"
+
+#~ msgid "Motorboat"
+#~ msgstr "Моторная лодка"
+
+#~ msgid "Cycleway"
+#~ msgstr "Велодорожка"
+
+#~ msgid "Footway"
+#~ msgstr "Тротуар"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "Грунтовка 3 класса"
+
+#~ msgid "Track Grade 1"
+#~ msgstr "Грунтовка 1 класса"
+
+#~ msgid "Track Grade 2"
+#~ msgstr "Грунтовка 2 класса"
+
+#~ msgid "Track Grade 4"
+#~ msgstr "Грунтовка 4 класса"
+
+#~ msgid "Track Grade 5"
+#~ msgstr "Грунтовка 5 класса"
 
 #~ msgid "Refresh the selection list."
@@ -30936,9 +31633,4 @@
 #~ msgstr "Выбрана только одна точка"
 
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr ""
-#~ "Пожалуйста, выберите контуры, у которых углы почти прямые, для применения "
-#~ "функции."
-
 #~ msgid "zoom"
 #~ msgstr "масштаб"
@@ -30959,4 +31651,19 @@
 #~ msgstr "Подъёмный мост"
 
+#~ msgid "Edit Hiking"
+#~ msgstr "Править туризм"
+
+#~ msgid "Edit Demanding Mountain Hiking"
+#~ msgstr "Править продвинутый горный туризм"
+
+#~ msgid "Edit Alpine Hiking"
+#~ msgstr "Править альпийский туризм"
+
+#~ msgid "Mountain Hiking"
+#~ msgstr "Горный туризм"
+
+#~ msgid "Edit Mountain Hiking"
+#~ msgstr "Править горный туризм"
+
 #~ msgid "Edit Station"
 #~ msgstr "Править станцию"
@@ -30976,7 +31683,4 @@
 #~ msgid "bicyclemap"
 #~ msgstr "карта велодорожек"
-
-#~ msgid "board"
-#~ msgstr "доска информации"
 
 #~ msgid "Oberpfalz Geofabrik.de"
@@ -31213,7 +31917,4 @@
 #~ msgstr "Импортировать файл TCX..."
 
-#~ msgid "Public"
-#~ msgstr "Публичный"
-
 #~ msgid "error requesting update"
 #~ msgstr "ошибка при запросе обновления"
@@ -31264,4 +31965,25 @@
 #~ msgid "Update Data"
 #~ msgstr "Обновить данные"
+
+#~ msgid "Edit Track of grade 1"
+#~ msgstr "Править грунтовку 1 класса"
+
+#~ msgid "Edit Track of grade 2"
+#~ msgstr "Править грунтовку 2 класса"
+
+#~ msgid "Edit Track of grade 3"
+#~ msgstr "Править грунтовку 3 класса"
+
+#~ msgid "Edit Track of grade 4"
+#~ msgstr "Править грунтовку 4 класса"
+
+#~ msgid "Edit Track of grade 5"
+#~ msgstr "Править грунтовку 5 класса"
+
+#~ msgid "Edit Demanding Alpine Hiking"
+#~ msgstr "Править продвинутый альпийский туризм"
+
+#~ msgid "Edit Difficult Alpine Hiking"
+#~ msgstr "Править сложный альпийский туризм"
 
 #~ msgid "Edit Drawbridge"
@@ -31372,7 +32094,4 @@
 #~ msgid "Show Author Panel"
 #~ msgstr "Показать панель автора"
-
-#~ msgid "Interpolation"
-#~ msgstr "Интерполяция"
 
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
@@ -31589,4 +32308,7 @@
 #~ msgstr "Объединить в любом случае"
 
+#~ msgid ">"
+#~ msgstr ">"
+
 #~ msgid "Apply partial resolutions"
 #~ msgstr "Применить частичное решение"
@@ -31620,4 +32342,7 @@
 #~ msgid "Remove relation member {0} {1}"
 #~ msgstr "Удалить участника отношений {0} {1}"
+
+#~ msgid "Conflicts in data"
+#~ msgstr "Конфликт в данных"
 
 #~ msgid "Conflict created"
@@ -31706,4 +32431,7 @@
 #~ msgstr "Заменить"
 
+#~ msgid "Dialog not created yet. Invoke createInstance() first"
+#~ msgstr "Диалог ещё не создан. Сначала используйте createInstance()"
+
 #~ msgid "unsupported value ''{0}'' or parameter ''{1}''"
 #~ msgstr "неподдерживаемое значение ''{0}'' параметра ''{1}''"
@@ -31748,4 +32476,7 @@
 #~ "Ошиочный заголовок \"{0}\" не соответствует ожидаемой структуре \"{1}\""
 
+#~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+#~ msgstr "Ожидался экземпляр OsmDataLayer. Получено ''{0}''."
+
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
@@ -31769,4 +32500,13 @@
 #~ msgid "Primitive already deleted"
 #~ msgstr "Элемент уже удален"
+
+#~ msgid ""
+#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
+#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
+#~ "the new role?</html>"
+#~ msgstr ""
+#~ "<html>Вы назначили пустую роль на {0} элем .<br>Это эквивалентно удалению "
+#~ "ролей из этих элементов.<br>Вы действительно хотите назначить новую роль?"
+#~ "</html>"
 
 #~ msgid "Download referrers from OSM..."
@@ -31857,10 +32597,32 @@
 #~ "данные и начните новый слой в новой зоне."
 
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "параметр ''{0}'' не должен быть null"
+
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr "ожидался экземпляр OsmDataLayer или GpxLayer. Получен ''{0}''."
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "неожиданное возвращённое значение. Получено {0}"
 
+#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "требуется параметр ''{0}'' > 0. Получен {1}"
+
+#~ msgid "Expected ID >= 0. Got {0}."
+#~ msgstr "обнаружен id >= 0. Получено {0}"
+
+#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
+#~ msgstr "параметр ''{0}'' - имя недопустимого типа, получен ''{1}''"
+
+#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
+#~ msgstr "параметр ''{0}'' - недопустимый класс, получен ''{1}''"
+
 #~ msgid "There's no version valid at date ''{0}'' in this history."
 #~ msgstr "Нет версии действительной для даты \"{0}\" в этой истории"
 
+#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
+#~ msgstr ""
+#~ "параметр ''{0}'' должен быть в интервале 0..{1}, текущее значение {2}"
+
 #~ msgid "No earliest version found. History is empty."
 #~ msgstr "более ранняя версия не найдена. История пуста."
@@ -31868,4 +32630,14 @@
 #~ msgid "No latest version found. History is empty."
 #~ msgstr "более поздняя версия не найдена. История пуста."
+
+#~ msgid "Parameter current out of range. Got {0}."
+#~ msgstr ""
+#~ "текущее значение параметра вне допустимой области: текущее значение {0}"
+
+#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
+#~ msgstr "Параметр 'col' должен быть 0 или 1. Текущее значение {0}"
+
+#~ msgid "Parameter ''{0}'' must not be empty."
+#~ msgstr "параметр ''{0}'' не должен быть пустым"
 
 #~ msgid "Index out of bounds. Got {0}."
@@ -31888,4 +32660,10 @@
 #~ "значение ''{1}''"
 
+#~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "требуется параметр id ''{0}'' > 0. Получен {1}"
+
+#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
+#~ msgstr "ожидался параметр ''{0}'' >= 0, текущее значение ''{1}''"
+
 #~ msgid "Display the history of the selected primitive."
 #~ msgstr "Показать историю выделенного элемента"
@@ -31897,7 +32675,13 @@
 #~ msgstr "Связанные"
 
+#~ msgid "Bridleway"
+#~ msgstr "Дорога для верховой езды"
+
 #~ msgid "MIddle way: {0}"
 #~ msgstr "Середина линии: {0}"
 
+#~ msgid "Plugin {0} requires JOSM update to version {1}."
+#~ msgstr "Модуль {0} требует обновить JOSM до версии {1}."
+
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Модуль не найден: {0}."
@@ -31905,4 +32689,7 @@
 #~ msgid "Download missing plugins"
 #~ msgstr "Скачать недостающие модули"
+
+#~ msgid "The plugin could not be removed. Probably it was already disabled"
+#~ msgstr "Не удается удалить модуль. Возможно он уже выключен"
 
 #~ msgid ""
@@ -31956,4 +32743,11 @@
 #~ msgstr "Показать статус квадрата карты"
 
+#~ msgid "Unexpected column index. Got {0}."
+#~ msgstr "Неожиданный индекс столбца. Получено {0}."
+
+#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
+#~ msgstr ""
+#~ "Ожидался параметр ''{0}'' с тегами для определённого ключа. Получено {1}."
+
 #~ msgid ""
 #~ "<html>Failed to create an URL because the encoding ''{0}'' was<br>was "
@@ -31963,8 +32757,14 @@
 #~ "''{0}''<br>отсутствует в этой системе.</html>"
 
+#~ msgid "Illegal value for attribute ''uid''. Got ''{0}''."
+#~ msgstr "Неверное значение для атрибута ''uid''. Получено''{0}''."
+
 #~ msgid "Error: failed to add authentication credentials to the connection."
 #~ msgstr ""
 #~ "Ошибка: не удалось добавить учётные данные проверки подлинности к "
 #~ "соединению."
+
+#~ msgid "<html>"
+#~ msgstr "<html>"
 
 #~ msgid ""
@@ -32026,4 +32826,12 @@
 #~ msgid "Via node {0}, {1}"
 #~ msgstr "Точка \"via\" (через) {0}, {1}"
+
+#~ msgid ""
+#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
+#~ msgstr ""
+#~ "Невозможно вернуть команду ''{0}'' потому что слоя ''{1}'' больше нет"
+
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "Параметр ''{0}'' не должен быть пустым"
 
 #~ msgid ""
@@ -32055,4 +32863,13 @@
 #~ "{2}.<br>Удалить из отношения?</html>"
 
+#~ msgid ""
+#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
+#~ "This can lead to nodes being deleted accidentally.\n"
+#~ "Are you really sure to continue?"
+#~ msgstr ""
+#~ "Выделенные линии содержат точки, находящиеся за пределами\n"
+#~ "скачанной области. Некоторые точки могут быть случайно\n"
+#~ "удалены. Вы действительно хотите продолжить?"
+
 #~ msgid "Updates the currently selected primitives from the server"
 #~ msgstr "Обновить выделенные элементы с сервера"
@@ -32119,7 +32936,13 @@
 #~ msgstr "Не удалось запустить внешний браузер справки"
 
+#~ msgid "Object id > 0 expected. Got {0}"
+#~ msgstr "Ожидался объект с id > 0 . Получено {0}"
+
 #~ msgid "Failed to read command. Exiting help browser. Exception was:"
 #~ msgstr ""
 #~ "Невозможно прочитать команду. Выход из браузера справки. Исключение было:"
+
+#~ msgid "Id > 0 required, got {0}"
+#~ msgstr "Требуется id > 0, получено {0}"
 
 #~ msgid "Set manually the Lambert zone"
@@ -32150,6 +32973,18 @@
 #~ "будет на месте оригинальной точки отношения.</html>"
 
+#~ msgid "Expected array of length 4, got {0}"
+#~ msgstr "Ожидаемая длина массива 4, получено {0}"
+
 #~ msgid "At least one object to delete requird, got empty collection"
 #~ msgstr "По крайней мере, один удаляемый элемент получил пустую коллекцию"
+
+#~ msgid "Parameter ''{0}'' must not be empty"
+#~ msgstr "Параметр ''{0}'' не должен быть пустым"
+
+#~ msgid "Illegal double value ''{0}''"
+#~ msgstr "Неверное значение дубля ''{0}''"
+
+#~ msgid "Exactly four doubles excpected in string, got {0}"
+#~ msgstr "Только четыре дубля ожидалось в строке, получено {0}"
 
 #~ msgid "Failed to load load resource ''{0}''. Error is {1}"
@@ -32198,4 +33033,7 @@
 #~ "линию; объединить полигоны; перейти в указанную точку."
 
+#~ msgid "Value of child.getId() > 0 expected. Got {1}."
+#~ msgstr "Ожидалось значение child.getId() > 0. Получено {1}."
+
 #~ msgid "User with the same uid but different name found"
 #~ msgstr ""
@@ -32209,4 +33047,16 @@
 #~ msgstr "неожиданное значение null для n.getEastNorth(). id из n"
 
+#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+#~ msgstr "Ожидался параметр ''{0}'' > 0.0, получено {1}"
+
+#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
+#~ msgstr "Ожидался параметр ''{0}'' > 0, получено {1}"
+
+#~ msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+#~ msgstr "ожидался id in parameter ''{0}'' > 0, получено {1}."
+
+#~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
+#~ msgstr "Ожидался параметр ''{0}'' > 0. Получено {1}."
+
 #~ msgid "Looking up available translations..."
 #~ msgstr "Идёт поиск доступных переводов..."
@@ -32223,4 +33073,28 @@
 #~ msgid "Delete old plugin file {0}"
 #~ msgstr "Удалить старый файл модуля {0}"
+
+#~ msgid "Expected value > 0 for parameter ''{0}'', got {1}"
+#~ msgstr "Ожидалось значение > 0 для параметра ''{0}'', получено {1}"
+
+#~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
+#~ msgstr "Ожидался параметр ''{0}'' >= 0, получено {1}"
+
+#~ msgctxt "changeset.open"
+#~ msgid "Closed"
+#~ msgstr "Закрыто"
+
+#~ msgctxt "changeset.open"
+#~ msgid "Open"
+#~ msgstr "Открыть"
+
+#~ msgid "Parameter ''{0}'' of type node expected, got ''{1}''"
+#~ msgstr "Ожидался параметр ''{0}'' типа точки , получен ''{1}''"
+
+#~ msgid "Expected value of type long > 0 for parameter ''{0}'', got {1}"
+#~ msgstr ""
+#~ "Ожидалось значение типа long > 0 для параметра ''{0}'', получено {1}"
+
+#~ msgid "Expected integer value > 0 for parameter ''{0}'', got ''{1}''"
+#~ msgstr "Ожидаемое значение цело > 0 для параметра ''{0}'', получено ''{1}''"
 
 #~ msgid " (<a href=\"urn:changeset-configuration\">configure changeset</a>)"
Index: applications/editors/josm/i18n/po/sk.po
===================================================================
--- applications/editors/josm/i18n/po/sk.po	(revision 19689)
+++ applications/editors/josm/i18n/po/sk.po	(revision 19698)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 23:20-0500\n"
-"PO-Revision-Date: 2010-01-18 13:29-0500\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-23 22:14+0000\n"
 "Last-Translator: Vlado <babicvm@szm.sk>\n"
 "Language-Team: Slovak <sk@li.org>\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-01-13 18:25+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -70,11 +70,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -242,5 +242,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -254,13 +254,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -269,5 +269,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -293,5 +296,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Zlúčiť"
@@ -322,5 +325,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -387,9 +390,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -397,5 +400,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "OK"
@@ -446,6 +451,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -463,5 +468,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -470,11 +475,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -511,5 +516,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "konflikt"
@@ -642,14 +647,14 @@
 msgstr "Prosím, vyberte aspoň dve cesty pre spojenie."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Kopírovať"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Vybrať označené objekty pre vloženie."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Prosím zvoľ niečo pre kopírovanie"
@@ -682,8 +687,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -692,5 +697,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -747,18 +752,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Boli tam {0} konflikty počas importu."
-msgstr[1] "Boli tam {0} konflikty počas importu."
-msgstr[2] "Boli tam {0} konflikty počas importu."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "Konflikty počas sťahovania"
-msgstr[1] "Konflikty počas sťahovania"
-msgstr[2] "Konflikty počas sťahovania"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -779,4 +781,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -786,4 +790,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplikovať výber kopírovaním a vložením."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Duplikát cesty"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "Načítať aktuálne vybranú reláciu"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "Vrstva: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "Priblížiť na {0}"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr ""
 
 #. <button label="Info" hotkey="I">
@@ -874,11 +906,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 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] "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."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -999,5 +1029,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "URL"
@@ -1148,5 +1178,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+#, fuzzy
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr "<html>Nemôžem otvoriť adresár.<br>Prosím vyberte súbor!"
 
@@ -1160,10 +1191,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Otváram {0} súbory..."
-msgstr[1] "Otváram {0} súbory..."
-msgstr[2] "Otváram {0} súbory..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1219,7 +1249,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1233,5 +1263,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "Posunúť body tak, že všetky úhly sú 90 alebo 270 stupňov"
 
@@ -1273,4 +1304,9 @@
 "chcete odstrániť toto upozornenie.<br>Chcete pokračovať?</html>"
 
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+#, fuzzy
+msgid "Selection must consist only of ways and nodes."
+msgstr "Multipolygón sa musí skladať iba z uzavretých ciest."
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
 msgid "Orthogonalize"
@@ -1285,4 +1321,16 @@
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "Vybrané prvky nemôžu byť zpravouhlené"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr ""
+"Prosím vyberte cesty s takmer pravými uhlami pre vytvorenie pravouhlosti."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1390,18 +1438,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1426,12 +1474,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Chyba"
@@ -1567,5 +1616,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1780,10 +1829,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "Duplikovať body {0} do {1} bodov"
-msgstr[1] "Duplikovať body {0} do {1} bodov"
-msgstr[2] "Duplikovať body {0} do {1} bodov"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1827,5 +1875,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr "Sťahujem dáta"
@@ -2257,6 +2305,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2338,7 +2386,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
-#, fuzzy
 msgid "<not>"
-msgstr "sever"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
@@ -2351,7 +2398,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
-#, fuzzy
 msgid "<right parent>"
-msgstr "Chýbajúca pravá zátvorka"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:26
@@ -2381,5 +2427,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Vyhľadávať objekty"
@@ -2578,5 +2624,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Hľadať"
@@ -2616,25 +2662,22 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "CS"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
-msgstr "CI"
+msgstr ""
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
-msgstr "RX"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2647,5 +2690,5 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
@@ -2653,5 +2696,5 @@
 "použitia: kľúč=hodnota"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2674,7 +2717,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
-msgstr "Neočakávaná značka: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
@@ -2796,10 +2839,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "Preidaných {0} objektov"
-msgstr[1] "Preidaných {0} objektov"
-msgstr[2] "Preidaných {0} objektov"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2849,12 +2891,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "Odstranené \"{0}\" pre {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Nastavené {0}={1} pre {2} {3}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2864,11 +2906,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''.<br>This "
 "conflict cannot be added.</html>"
 msgstr ""
-"<html>Vrstva ''{0}'' má práve konflikt pre obecné<br>''{1}''.<br>Tento "
-"konflikt nemôže byť pridaný.</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
@@ -2917,17 +2957,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Režim mazania"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Zmazať {0} cesty"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Zmazať {0} relácie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -3013,10 +3053,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "Očistené {0} objekty"
-msgstr[1] "Očistené {0} objekty"
-msgstr[2] "Očistené {0} objekty"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -3067,25 +3106,24 @@
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "Undelete {0} primitive"
 msgid_plural "Undelete {0} primitives"
-msgstr[0] "Obnoviť {0} pôvodných"
-msgstr[1] "Obnoviť {0} pôvodných"
-msgstr[2] "Obnoviť {0} pôvodných"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for node {0}"
-msgstr "Vyriešiť konflikty verzie pre bod {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for way {0}"
-msgstr "Vyriešiť konflikty verzie pre cestu {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Vyriešiť konflikty verzie pre reláciu {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3336,5 +3374,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:140
 msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr ""
+msgstr "Varovanie: opravný súbor ''/REVISION'' chýba."
 
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:76
@@ -3358,5 +3396,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3364,5 +3402,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3370,5 +3408,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3376,5 +3414,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3447,81 +3485,72 @@
 #. column header: hide filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
-#, fuzzy
 msgctxt "filter"
 msgid "H"
-msgstr "H"
+msgstr ""
 
 #. column header: filter text
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:144
-#, fuzzy
 msgctxt "filter"
 msgid "Text"
-msgstr "Text"
+msgstr ""
 
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "C"
+msgstr ""
 
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
-#, fuzzy
 msgctxt "filter"
 msgid "I"
-msgstr "I"
+msgstr ""
 
 #. column header: filter mode
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
-#, fuzzy
 msgctxt "filter"
 msgid "M"
-msgstr "M"
+msgstr ""
 
 #. translators notes must be in front
 #. filter mode: replace
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210
-#, fuzzy
 msgctxt "filter"
 msgid "R"
-msgstr "R"
+msgstr ""
 
 #. filter mode: add
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211
-#, fuzzy
 msgctxt "filter"
 msgid "A"
-msgstr "A"
+msgstr ""
 
 #. filter mode: remove
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212
-#, fuzzy
 msgctxt "filter"
 msgid "D"
-msgstr "D"
+msgstr ""
 
 #. filter mode: in selection
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213
-#, fuzzy
 msgctxt "filter"
 msgid "F"
-msgstr "F"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "pôvodné s id=0 nemôžu byť neviditeľné"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "ID > 0 očakávané. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "verzia > 0 očakávaná. Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3530,5 +3559,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3536,5 +3565,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3659,6 +3688,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3669,5 +3698,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3679,7 +3708,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3702,5 +3731,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "pozadie"
@@ -3846,6 +3875,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3853,37 +3882,38 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "neúplný"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "komunikácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "železnica"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "vodný tok"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "využitie oblasti (landuse)"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3893,10 +3923,10 @@
 msgstr[2] "{0} bodov"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3906,5 +3936,5 @@
 msgstr[2] "{0} členy"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3941,6 +3971,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Konflikt"
@@ -3951,7 +3981,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-#, fuzzy
-msgid "Authorization Failed"
-msgstr "Spojenie zlyhalo."
+msgid "Authorisation Failed"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
@@ -4155,5 +4184,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Prebieha inicializácia"
@@ -4194,5 +4222,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4203,5 +4231,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Upraviť"
@@ -4272,29 +4300,29 @@
 msgstr "mierka"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 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:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 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:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Zemepisná šírka na mieste kurzoru myši."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 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:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 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:106
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 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:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4304,9 +4332,9 @@
 "výber priamo z tohoto zoznamu s myšou.<hr>"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(žiadny objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4473,18 +4501,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Značky({0} konfliktov)"
-msgstr[1] "Značky({0} konfliktov)"
-msgstr[2] "Značky({0} konfliktov)"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "{0} pending tag conflict to be resolved"
 msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} nevyriešený konflikt značiek musí byť vyriešený"
-msgstr[1] "{0} nevyriešený konflikt značiek musí byť vyriešený"
-msgstr[2] "{0} nevyriešený konflikt značiek musí byť vyriešený"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
@@ -4543,16 +4569,16 @@
 msgstr "Rozhodnutie konfliktov"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr "zoznam funkcií {0} sa teraz nenachádza v porovnávanej dvojici"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "neočakávaná hodnota parametra\"index\". Got {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4770,7 +4796,12 @@
 msgstr "Bod"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr "Spojované body sú ešte neblokované. Nie je možné dať vykonávací povel"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4797,5 +4828,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional node used by way {1}<br>which is deleted on the "
@@ -4805,12 +4836,5 @@
 "server.<br><br>Do you want to undelete these nodes too?"
 msgstr[0] ""
-"<html>Sú tam {0} ďalšie body použité v ceste {1}<br>ktoré sú vymazané na "
-"servery.<br><br>Chcete obnoviť tieto body tiež?</html>"
 msgstr[1] ""
-"<html>Sú tam {0} ďalšie body použité v ceste {1}<br>ktoré sú vymazané na "
-"servery.<br><br>Chcete obnoviť tieto body tiež?</html>"
-msgstr[2] ""
-"<html>Sú tam {0} ďalšie body použité v ceste {1}<br>ktoré sú vymazané na "
-"servery.<br><br>Chcete obnoviť tieto body tiež?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
@@ -4819,5 +4843,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional primitive referred to by relation {1}<br>which is "
@@ -4827,12 +4851,5 @@
 "deleted on the server.<br><br>Do you want to undelete these too?"
 msgstr[0] ""
-"<html>Sú tam {0} ďalšie pôvodné odkazy na reláciu {1}<br>ktoré sú zmazané na "
-"servery.<br><br>Chcete ich obnoviť tiež?</html>"
 msgstr[1] ""
-"<html>Sú tam {0} ďalšie pôvodné odkazy na reláciu {1}<br>ktoré sú zmazané na "
-"servery.<br><br>Chcete ich obnoviť tiež?</html>"
-msgstr[2] ""
-"<html>Sú tam {0} ďalšie pôvodné odkazy na reláciu {1}<br>ktoré sú zmazané na "
-"servery.<br><br>Chcete ich obnoviť tiež?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
@@ -4935,5 +4952,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr "Nie, zrušiť"
@@ -4984,5 +5001,10 @@
 msgstr "Pôvodný"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -5113,10 +5135,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "žiadny"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "všetky"
@@ -5197,7 +5219,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -5208,6 +5230,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5394,10 +5416,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5417,13 +5439,13 @@
 msgstr "Príkazový Stĺpik: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr "Vyriešiť konflikty."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Vyriešiť"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
@@ -5431,6 +5453,6 @@
 "v obsahu na vrchu."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5461,11 +5483,12 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:216
-#, java-format
+#, fuzzy, java-format
 msgid ""
 "<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions won't be applied unless all differences<br>are "
-"resolved.Click <strong>{0}</strong> to close anyway."
-"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<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>You didn''t finish to merge the differences in this conflict."
@@ -5493,5 +5516,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5500,5 +5523,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5578,43 +5601,48 @@
 msgstr "Zobraziť históriu(priebeh) vybraných objektov."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 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:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Zobraziť/Skryť"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr "Aktivovať"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr "Aktivovať vybratú vrstvu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 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:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Duplikát cesty"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 msgid "Move the selected layer one row up."
 msgstr "Presunúť zvolenú vrstvu o riadok hore."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Presunúť zvolenú vrstvu o riadok dole."
@@ -5628,6 +5656,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Relácie"
@@ -5637,69 +5665,69 @@
 msgstr "Otvoríť zoznam všetkých relácií"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relácie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Otvoriť editor pre zvolenú reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Zmazať vybraté relácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Vytvoriť novú reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "Vytvoriť kópiu z tejto relácie a otvoriť ju inom editovacom okne"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr "Pridať aktuálny výber do zoznamu vybratých relácií"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr "Výber členov zo všetkých vybraných relácií"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr "Výber členov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr "Stiahnutie všetkých členov z vybraných relácií"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr "Stiahnuť členov"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Súčasný výber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Otvoriť výber obsahu okien."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Priblížiť na vybraté elementy(s)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Priblížiť na výber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Sel.: Rel.:{0} / Cesty:{1} / Body:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5707,5 +5735,5 @@
 msgstr "Výber"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5974,5 +6002,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331
@@ -6062,8 +6089,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -6135,4 +6160,7 @@
 #. <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 />
@@ -6211,6 +6239,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6252,6 +6281,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6720,152 +6751,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Názov"
@@ -6956,9 +6989,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:141
-#, fuzzy
 msgid ""
 "The current value is not a valid changeset ID. Please enter an integer value "
 "> 0"
-msgstr "Hodnota ''{0}'' nie je číslo. Prosím vložte celé číslo > 1"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
@@ -7107,8 +7139,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
-#, fuzzy
 msgid ""
 "The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr "Hodnota ''{0}'' nie je číslo. Prosím vložte celé číslo > 1"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
@@ -7251,5 +7282,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<rôzne>"
@@ -7306,55 +7337,55 @@
 msgstr "Pridať vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Vlastnosti: {0} / Memberships: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Vlastnosti / Memberships"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Zmeniť reláciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "Zmazať z relácie (zo vzťahu"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Naozaj zmazať výber z relacie {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Zmaže zvolený klúč vo všetkých objektoch"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "Zmazať vlastnosti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Pridať nový kľúč/hodnota pár k všetkým objektom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Zmeniť hodnotu zvoleného klúča pre všetky objekty"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7390,10 +7421,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1093
-#, fuzzy
 msgid "Conflict in data"
 msgid_plural "Conflicts in data"
-msgstr[0] "Konflikt v dátach"
-msgstr[1] "Konflikt v dátach"
-msgstr[2] "Konflikt v dátach"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:345
@@ -7698,5 +7727,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
@@ -7799,9 +7827,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: ignoring exception because task was cancelled. Exception was: {0}"
 msgstr ""
-"Varovanie: ignorovanie výnimky pretože úloha bola zrušená. Výnimka bola: "
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
@@ -7822,30 +7849,30 @@
 "cesta nie je pripojená do predchádzajúceho alebo nasledujúceho člena relácie"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Záložky"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr "<html>Nie je vybraná oblasť pre stiahnutie.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+#, fuzzy
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
 msgstr ""
 "<html><strong>Aktuálne sťahovaná oblasť</strong> (minlat,minlon, maxlat, "
 "maxlon): {0}, {1}, {2}, {3}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr "Vytvoriť záložku"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:185
 msgid "Add a bookmark for the currently selected download area"
 msgstr "Pridať záložku pre aktuálne výbranú sťahovanú oblasť"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:187
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:192
 msgid ""
 "Currently, there is no download area selected. Please select an area first."
@@ -7854,19 +7881,19 @@
 "oblasť."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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 "Prosím zvoľte názov pre záložku zo sťahovanej oblasti"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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 "Názov miesta"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:212
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:217
 msgid "Remove the currently selected bookmarks"
 msgstr "Vymazať vybraté záložky"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr "Premenovať vybratú záložku"
@@ -7995,18 +8022,18 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr "Hranice"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr "Blízko"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -8017,34 +8044,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
 msgid "Enter a place name to search for:"
 msgstr "Zapíšte názov miesta pre vyhľadávanie:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:112
 msgid "Enter a place name to search for"
 msgstr "Vložte názov miesta pre hľadanie"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:148
 msgid "Areas around places"
 msgstr "Oblasť okolo miesta"
 
 #. SAXException does not chain correctly
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Chyba null pointera, možno sú neprítomné značky"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr "Hľadám ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr "Kliknutím sa spustí hľadanie pre miesta"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr "Pýtam sa na meno servera"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr "Pýtam sa na meno servera ..."
@@ -8055,7 +8082,9 @@
 #. 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" />
@@ -8064,10 +8093,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Typ"
@@ -8076,5 +8106,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -8086,17 +8116,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "neznámy"
@@ -8221,7 +8250,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:511
-#, fuzzy, java-format
+#, java-format
 msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr "Varovanie: zlé umiestnenie v HTML dokumente. Výnimka bola: "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:561
@@ -8461,5 +8490,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr "Objavené konflikty"
@@ -8845,5 +8874,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>{0} layer needs saving but has an associated file<br>which cannot be "
@@ -8855,15 +8884,5 @@
 "changes.<br>Layers with non-writable files:</html>"
 msgstr[0] ""
-"<html>{0} vrstvy potrebujú uloženie, ale majú pridružené súbory<br>ktoré nie "
-"sú zapisovateľné.<br>Najskôr vyberte iné súbory pre tieto vrstvy, alebo "
-"zrušte zmeny pre tieto vrstvy.<br>Vrstvy s nezapisovateľnými súbormi:</html>"
 msgstr[1] ""
-"<html>{0} vrstva potrebuje uloženie, ale má pridružený súbor<br>ktorý nie je "
-"zapisovateľný.<br>Najskôr vyberte iný súbor pre túto vrstvu, alebo zrušte "
-"zmeny pre túto vrstvu.<br>Vrstva s nezapisovateľným súborom:</html>"
-msgstr[2] ""
-"<html>{0} vrstiev potrebuje uloženie, ale majú pridružené súbory<br>ktoré "
-"nie sú zapisovateľné.<br>Najskôr vyberte iné súbory pre tieto vrstvy, alebo "
-"zrušte zmeny pre tieto vrstvy.<br>Vrstvy s nezapisovateľnými súbormi:</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
@@ -8913,5 +8932,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "<html>An upload and/or save operation of one layer with modifications<br>was "
@@ -8921,12 +8940,5 @@
 "cancelled or have failed.</html>"
 msgstr[0] ""
-"<html>Nejaké nahrávanie /alebo ukladacia operácia jednej z vrstiev s "
-"úpravami<br>bola zrušená alebo skončila neúspechom.</html>"
 msgstr[1] ""
-"<html>Nejaké nahrávanie /alebo ukladacia operácia jednej z vrstiev s "
-"úpravami<br>bola zrušená alebo skončila neúspechom.</html>"
-msgstr[2] ""
-"<html>Nejaké nahrávanie /alebo ukladacia operácia jednej z vrstiev s "
-"úpravami<br>bola zrušená alebo skončila neúspechom.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500
@@ -8949,9 +8961,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8961,7 +8973,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -8973,16 +8985,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "Vrstva"
@@ -9409,68 +9421,68 @@
 msgstr[2] "{0} zmazaných objektov:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "gps poloha bodu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Prispôsobiť kresliacu trasu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Use global settings."
 msgstr "Použíť globálne nastavenie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:204
 msgid "Draw lines between points for this layer."
 msgstr "Kresliť spojnice medzi bodmi v tejto vrstve"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:205
 msgid "Do not draw lines between points for this layer."
 msgstr "Nekresliť spojnice mezi bodmi v tejto vrstve"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:221
 msgid "Select line drawing options"
 msgstr "Výber nastavenia kreslenej čiary"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Prispôsobiť farbu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Predvolené"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Zvoľte farbu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr "Značky z pomenovaných bodov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Pomenovanie trackpoints od {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Importovať zvuk"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9482,23 +9494,23 @@
 "cesty neobsahujú časovú značku nemôžme ich zladiť s audio dátami.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr "Import nie je možný"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audiosúbory (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Zukové značky z {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Importovať obrázky"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9510,5 +9522,5 @@
 "cesty neobsahujú časovú značku nemôžme ich zladiť s obrázkami.</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9516,5 +9528,5 @@
 msgstr "Meno: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9522,5 +9534,5 @@
 msgstr "Popis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9531,23 +9543,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "Popis"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr "Časový interval"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr "Dĺžka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Dĺžka: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9557,5 +9569,5 @@
 msgstr[2] "{0} trás, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9565,10 +9577,10 @@
 msgstr[2] "{0} waypointov (bodov cesty)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Konvertovať do dátovej vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9578,43 +9590,43 @@
 "chcete nahrať stopy (traces), pozrite sem:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Prevedené z: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "Stiahnuť z OSM okolie tejto stopy (track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Stiahnuť všetko vo vnútry:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metrov"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "Maximálna plocha na požiadavku:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} štvorcových km"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9625,9 +9637,9 @@
 "<br>Chcete pokračovať?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 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:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9637,5 +9649,5 @@
 "alebo za koncom, boli vynechané, alebo presunuté na začiatok."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9645,23 +9657,23 @@
 "ich času boli vynechané."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Údajová vrstva {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "mimo ukladanej oblasti"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr "verzia {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 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:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9671,5 +9683,5 @@
 msgstr[2] "Bolo tam zistených {0} konfliktov."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9690,5 +9702,5 @@
 "objektov<br>z miestnej dátovej sady, pretože bol zmazaný na servery."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9708,11 +9720,11 @@
 "List Dialog a manuálne ich vyriešte."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 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:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9722,32 +9734,32 @@
 msgstr[2] "{0} vymazaných"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} se skladá z:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr "neuršený (unset)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr "Verzia API: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Previesť do GPX vrstvy"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr "Test konzistencie dátovej sady"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr "Nezistený žiadny problém"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr "Bol najdený nasledujúci problém:"
@@ -9801,28 +9813,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "GPS body"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Súbory GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, 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:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Chyba pri rozkladaní {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Nemôžem čítať \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9834,34 +9845,34 @@
 "html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr "Čas fotografie (z exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 msgid "Gps time (read from the above photo): "
 msgstr "GPS čas (čítaj nad fotografiou) "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr "Som v časovej zóne: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "Žiaden dátum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr "Otvoriť inú fotografiu"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 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:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9871,64 +9882,64 @@
 "Prosím použite požadovaný formát."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "Neplatný dátum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr "<Nie je zatiaľ nahratá GPX stopa (track)>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr "GPX stopa(trasa): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr "Otvoriť inú GPX stopu(trasu)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr "Časové pásmo: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr "Vyrovnať(Offset):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9937,47 +9948,46 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr "Zladiť obrázky s GPX stopou(track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr "Zladiť"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr "Neplatné časové pásmo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr "Neplatné vyrovnanie (offset)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Časové pásmo: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minút: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekúnd: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9986,5 +9996,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9994,21 +10004,21 @@
 "posúvač ručne na fotky."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr "Priraďovanie fotiek ku stope(track) zlyhalo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr "Nastaviť časové pásmo a vyváženie(offset)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 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:951
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr "Fotografie neobsahujú informácie o čase."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -10016,17 +10026,17 @@
 msgstr "Vybratá GPS stopa neobsahuje časové značky. Prosím vyberte inú."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 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:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr "Môžete vybrať GPX stopu(track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr "Nevybratá GPX stopa(track)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -10037,5 +10047,5 @@
 "Čakám na formát: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -10046,77 +10056,75 @@
 "Čakám na formát: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "Získavam GPS polohu z EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr "Začínam prehľadávať adresár"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr "Niektorý z vybratých súborov bol prázdny"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "Čítať fotky..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Čítam {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr "Nemôžem získať cestu pre adresár {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Prehľadávam adresár {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "Nájdený prázdny súbor v adresári {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "Chyba pri získavaní súború z adresára {0}\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Obrázky s GPS súradnicami"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr "Zladiť GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "{0} Sprostredkujúce(via) body."
-msgstr[1] "{0} Sprostredkujúce(via) body."
-msgstr[2] "{0} Sprostredkujúce(via) body."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
+#, java-format
 msgid "{0} was found to be GPS tagged."
 msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] "{0} boli nájdené s gps značkami."
-msgstr[1] "{0} boli nájdené s gps značkami."
-msgstr[2] "{0} boli nájdené s gps značkami."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -10125,5 +10133,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -10220,5 +10228,5 @@
 msgstr "gps značka"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -10227,5 +10235,5 @@
 msgstr[2] "značiek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -10235,9 +10243,9 @@
 msgstr[2] "{0} pozostáva z {1} značiek"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "Synchronizovať audio"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 msgid ""
 "You need to pause audio at the moment when you hear your synchronization cue."
@@ -10246,20 +10254,20 @@
 "synchronizácie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr "Zvuk zosynchronizovaný na bode {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 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:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -10268,5 +10276,5 @@
 "Potrebujete pozastaviť(pause) audio v bode na stope, kde chcete mať znažku."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
@@ -10274,13 +10282,13 @@
 "posunutie."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Zobraziť/Skryť Text/Ikony"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 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:171
+#: ../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 "
@@ -10290,5 +10298,5 @@
 "priradená zvuková stopa, ktorá sa má prehrávať (po prvej značke)."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -10298,5 +10306,5 @@
 "až na track point, ktorý chcete zosynchronizovať."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "Nie je možné vytvoriť novú zvukovú značku"
@@ -10322,15 +10330,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
+#, java-format
 msgid ""
 "Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr "Varovanie:neúspešné čítanie MOTD z ''{0}''. Výnimka bola: {1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
+#, java-format
 msgid ""
 "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr "Varovanie:neúspešné čítanie MOTD z ''{0}''. Výnimka bola: {1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
@@ -10378,8 +10386,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize URL:"
-msgstr "Autor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10469,8 +10475,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize now"
-msgstr "Autor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10529,7 +10533,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
-#, fuzzy
 msgid "OAuth authorization failed"
-msgstr "Spojenie zlyhalo."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
@@ -10609,8 +10612,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
-#| msgid "Please select at least four nodes."
 msgid "Please select an authorization procedure: "
-msgstr "Vyberte minimálne 4 body"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10620,8 +10621,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
-#, fuzzy
-#| msgid "Close dialog and cancel downloading"
 msgid "Close the dialog and cancel authorization"
-msgstr "Zavrieť dialóg a zrušiť sťahovanie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
@@ -10675,8 +10674,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:498
-#, fuzzy, java-format
-#| msgid "Missing required attribute ''{0}''."
+#, java-format
 msgid "Authorizing request token ''{0}''..."
-msgstr "Chýba povinná vlastnosť ''{0}''."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:504
@@ -10896,5 +10894,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
-#, fuzzy
 msgid ""
 "<html>The test failed because the server responded with an internal error."
@@ -10902,6 +10899,4 @@
 "</html>"
 msgstr ""
-"<html>OSM server<br>''{0}''<br>hlási vnútornú chybu serveru.<br>Toto je "
-"veľmi pravdepodobne dočasný problém. Prosím skúste znovu neskôr.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251
@@ -10938,5 +10933,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Prosím vyberte riadok na úpravu."
@@ -10950,5 +10945,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -11098,9 +11093,4 @@
 msgstr "Farebný štýl {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "Vrstva: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -11130,6 +11120,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr "Všetko"
@@ -11168,8 +11158,8 @@
 msgstr "Jedna farba (môže byť prispôsobená pre pomenované vrstvy)"
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Vozidlo"
@@ -11191,13 +11181,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Bicykel"
@@ -11230,12 +11220,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "Pešo"
@@ -11589,5 +11579,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
-#, fuzzy
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11603,14 +11592,4 @@
 "keyboard...</p>"
 msgstr ""
-"<p>Ako ste si mohli všimnúť, že výber kláves ktorý ponúka ďalšia strana sa "
-"nachádza na každom druhu klávesníc ktorá Java pozná, ale nemusí poznať "
-"všetky klávesy na vašej klávesnici. Prosím použite iba hodnoty, ktoré "
-"zodpovedajú skutočnej klávese na vašej klávesnici. Takže ak vaša klávesnica "
-"nemá \"Copy\" klávesu (PC klávesnica ju nemá, SUN klávesnica ju má), tak ju "
-"nepoužite. Tiež tam môžu byť 'klávesy' obsahovo zhodné s klávesovou skratkou "
-"na vašej klávesnici (e.g. ':'/Colon). Prosím tiež ich nepoužite, miesto nich "
-"použite základné klávesy (';'/Semicolon on US keyboards, '.'/Period on "
-"German keyboards, ...). Nerešpektujte nič, čo by viedlo ku konfliktu, JOSM "
-"napríklad nevie, že Ctrl+Shift+; and Ctrl+: sú zhodné na US klávesnici...</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
@@ -12231,5 +12210,12 @@
 msgstr "Zmazať výber v tabuľke značiek"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -12237,18 +12223,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "Voliteľné atribúty:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr "uzavratá cesta"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Neznány type (druh): {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -12259,16 +12245,16 @@
 msgstr "Nemôžem načítať zdroj predvolieb značenia: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Chyba rozkladania(parsovania) {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, 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:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -12278,18 +12264,17 @@
 msgstr[2] "Zmeniť {0} objektov"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "Nič nie je vybraté!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "Nevhodný výber!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "Použiť predvolené"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Zmeniť vlastnosti"
@@ -12346,10 +12331,9 @@
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:88
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
 "capabilities. Got ''{2}''"
 msgstr ""
-"Chybná hodnota pre vlastnosť ''{0}'' na XML značke(tag) ''{1}''. Got {2}"
 
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:83
@@ -12568,6 +12552,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12592,9 +12576,9 @@
 msgstr "Rozloženie súboru \"{0}\" neúspešné"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Chyba parsovania: Chybná štruktúra GPX dokumentu"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12610,7 +12594,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
-#, fuzzy
 msgid "Looking for image files"
-msgstr "Hľadám breh..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
@@ -12618,15 +12601,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, fuzzy, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "Varovanie:neúspešné čítanie MOTD z ''{0}''. Výnimka bola: {1}"
+
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
-#, fuzzy, java-format
+#, java-format
 msgid "No primitive with id {0} in local dataset. Cannot infer primitive type."
 msgstr ""
-"žiadne pôvodné s id {0} v lokálnej dátovej sade. Nemôžem dedukovať typ "
-"pôvodných"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:308
@@ -12696,5 +12683,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "Importované súradnice: "
@@ -12800,10 +12787,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Nahrávam {0} objekty(ov) ..."
-msgstr[1] "Nahrávam {0} objekty(ov) ..."
-msgstr[2] "Nahrávam {0} objekty(ov) ..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -13357,10 +13343,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159
-#, fuzzy, java-format
+#, java-format
 msgid "({0}/{1}) Uploading {2} object..."
 msgid_plural "({0}/{1}) Uploading {2} objects..."
-msgstr[0] "({0}/{1}) Nahrávanie {2} objektov..."
-msgstr[1] "({0}/{1}) Nahrávanie {2} objektov..."
-msgstr[2] "({0}/{1}) Nahrávanie {2} objektov..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
@@ -13449,7 +13434,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:194
-#, fuzzy
 msgid "Click to update the activated plugins"
-msgstr "Kliknutím zavriete dialóg"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
@@ -13462,5 +13446,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -13468,7 +13452,6 @@
 "Plugin {0} requires {1} plugins which were not found. The missing plugins "
 "are:"
-msgstr[0] "Nebol nájdený plugin {0}, ktorý je vyžadovaný pluginom {1}."
-msgstr[1] "Nebol nájdený plugin {0}, ktorý je vyžadovaný pluginom {1}."
-msgstr[2] "Nebol nájdený plugin {0}, ktorý je vyžadovaný pluginom {1}."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13541,5 +13524,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:567
@@ -13554,7 +13536,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:625
-#, fuzzy, java-format
+#, java-format
 msgid "Click to delete the plugin ''{0}''"
-msgstr "Zmazať staršie pluginy {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
@@ -13590,7 +13572,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#, fuzzy, java-format
+#, java-format
 msgid "Click to disable the plugin ''{0}''"
-msgstr "Kliknutím zavriete dialóg"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:731
@@ -13638,7 +13620,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:69
-#, fuzzy, java-format
+#, java-format
 msgid "The plugin file ''{0}'' does not include a Manifest."
-msgstr "Súbor \"{0}\" neexistuje"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:181
@@ -13735,5 +13717,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13741,8 +13722,4 @@
 "file a bug report."
 msgstr ""
-"V programe sa vyskytla chyba.\n"
-"\n"
-"Ak používate najnovšiu verziu JOSM, zvážte vyplnenie a odoslanie hlásenia o "
-"chybe."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13843,6 +13820,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -13990,6 +13967,6 @@
 msgstr "Nemôžem nájsť preklad pre jazyk {0}. Vyberám {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -14000,5 +13977,5 @@
 "Výnimka bola: {1}"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -14166,4 +14143,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr "Viditeľnosť"
@@ -14254,5 +14232,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "Interpolácia adries"
@@ -14875,5 +14853,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr "Umiestnenie"
@@ -15042,21 +15020,21 @@
 "Odstráňte oblasť z relácie pred jej rozdelením."
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr "TangoGPS Súbory (*.log)"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr "Chybný formát: "
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr "TangoGPS import úspešný"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr "TangoGPS import neúspešný!"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr "TCX Súbory (*.tcx)"
@@ -15088,9 +15066,9 @@
 msgstr "Vytvoriť duplikát cesty"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr "Vrstva na úoravu GPX stôp(tracks)"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Konvertovať do GPX vrstvy s neznámym časom"
@@ -15105,13 +15083,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr "Importovať cestu z GPX vrstvy"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr "Zahodiť existujúcu cestu"
@@ -15120,6 +15098,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr "GPS dátová vrstva nie je vytvorená."
@@ -15348,17 +15326,17 @@
 msgstr "Načítať sadu obrázkov na novú vrstvu."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr "Smerový index'{0}' nenájdený"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr "Štartovacia poloha nebola vo vnútry bboxu"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:105
 msgid "Looking for shoreline..."
 msgstr "Hľadám breh..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -15402,42 +15380,41 @@
 msgstr "Odstraňujem duplicitné body..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr "Lakewalker stopa(trace)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr "Nastala neznáma chyba"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "východ"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "severovýchod"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "sever"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "severozápad"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "západ"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "juhozápad"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "juh"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "juhovýchod"
@@ -15493,6 +15470,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -15501,74 +15478,74 @@
 msgstr "voda"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "pobrežie"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "zem"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Maximum number of segments per way"
 msgstr "Maximálny počet úsekov na cestu"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
 msgid "Maximum number of nodes in initial trace"
 msgstr "Maximálny počet bodov v prvotnom trasovaní"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Maximálna hodnota šedej braná ako voda (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
 msgid "Line simplification accuracy (degrees)"
 msgstr "Presnosť zjednodušovania čiar (stupňov)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Rozlíšenie dlaždíc Landsatu (pixely na stupeň)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Veľkosť dlaždíc Landsatu (pixely)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
 msgid "Shift all traces to east (degrees)"
 msgstr "Posunúť všetky stopy(traces) na východ (stupeň)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
 msgid "Shift all traces to north (degrees)"
 msgstr "Posunúť všetky stopy(traces) na sever (stupeň)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
 msgid "Direction to search for land"
 msgstr "Smer hľadania zeme"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
 msgid "Tag ways as"
 msgstr "Značky ciest ako"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr "WMS Vrstva"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr "Maximálna veľkosť cache (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
 msgid "Maximum cache age (days)"
 msgstr "Maximálny vek cache (dni)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:68
 msgid "Source text"
 msgstr "Zdrojový text"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Maximálny počet úsekov v každej vygenerovanej ceste. Východzia hodnota 250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -15578,5 +15555,5 @@
 "Štandardne 50000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -15586,5 +15563,5 @@
 "Môže byť v rozsahu 0-255. Štandardne 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -15595,5 +15572,5 @@
 "0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -15601,29 +15578,29 @@
 "Rozlíšenie Landsat dlaždíc, merané v pixeloch na stupeň. Štandardne 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Veľkosť jednej Landsat dlaždice, meraná v pixeloch. Štandardne 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Vyrovnanie všetkých bodov vo Východnom smere(stupne). Štandardne 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Vyrovnanie všetkých bodov v Severnom smere(stupne). Štandardne 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Direction to search for land. Default east."
 msgstr "Smer hľadania zeme. Štandardne východ."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr "Značky ciest, ako voda, pobrežie, zem alebo nič. Štandardne voda."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "Ktorú WMS vrstvu použiť pre trasovanie. Štandardne je IR1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
@@ -15631,26 +15608,26 @@
 "hodnota je 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 "Maximálny vek jednotlivých súborov v cache v dňoch. Štandardná hodnota je 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr "Zdrojový text. Štandardne je Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "Pluginy pre trasovanie vodných plôch z fotografií Landsat."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr "Nastavenie pluginu Lakewalker"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:50
 msgid "Downloading image tile..."
 msgstr "Sťahujem dlaždice obrázka..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr "Nemôžem získať obrázok"
@@ -15674,5 +15651,5 @@
 msgstr "Spojenie zlyhalo"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr "bez mena"
@@ -15703,5 +15680,5 @@
 msgstr "Kurz (Smer)"
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr "LiveGPS layer"
@@ -15775,5 +15752,5 @@
 msgstr "Úhol medzi dvoma zvolenými bodmi"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr "Vrstva pre vykonávanie meraní"
@@ -16043,4 +16020,76 @@
 msgid "Firefox executable"
 msgstr "Spúšťací súbor Firefoxu"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#, fuzzy
+msgid "Read error!"
+msgstr "Nádrž"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Zadajte súradnice nového bodu."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Ponechávať záložné súbory"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Chyba"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "Zadaný čas nemôže byť rozparsovaný"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Nemôžem premenovať súbor ''{0}''"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Ponechávať záložné súbory"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "Ponechávať záložné súbory"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Prepísať"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+#, fuzzy
+msgid "Could not delete temporary file!"
+msgstr "Nemôžem nájsť typ elementu"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
@@ -16316,6 +16365,6 @@
 msgstr "Uložiť zachytené dáta do súboru každý minútu."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -16442,72 +16491,130 @@
 msgstr "Najskôr určite zdroj predvoľby značenia v predvoľbách."
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+#, fuzzy
+msgid "Terrace a house"
+msgstr "Vytvoriť rad budov"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+msgid "Interpolation"
+msgstr "Interpolácia (vloženie)"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Hlavné komunikácie"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Navyššie číslo"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Najnižšie číslo"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+#, fuzzy
+msgid "Lowest housenumber of the terraced house"
+msgstr "Otočenie uličných čísel radu budov"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Vytvoriť novú reláciu"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Vymazať zdvojené (duplikované) cesty"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Názov ulice"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr "Najnižšie číslo"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr "Navyššie číslo"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr "Otočiť smer radu budov"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr "Otočenie uličných čísel radu budov"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr "Otočiť smer radu budov"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:83
+#, fuzzy
+msgid "Cannot reverse!"
+msgstr "nie je prítomný"
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:125
 msgid "Reverse Terrace"
 msgstr "Otočiť smer radu budov"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr "Vytvoriť rad budov"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr "Vytvoriť viac jednotlivých budov z jednej dlhej budovy."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr "Vyberte jedinú, uzavretú cestu s najmenej štyrmi bodmi."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr "Rad (Terrace)"
@@ -16748,5 +16855,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr "Duplicitné body"
@@ -16756,5 +16863,5 @@
 msgstr "Tento test zisťuje či nie je viac bodov na jednom mieste."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16766,9 +16873,9 @@
 "<br>Naozaj ich chcete zmazať?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr "Potvrdenie"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr "Body s rovnakou pozíciou"
@@ -16805,5 +16912,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr "multipolygón"
@@ -16954,7 +17061,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr "Neplatná kombinácia klúča/hodnoty"
@@ -16962,80 +17069,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr "Problém s vykresľováním"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Klúč ''{0}'' je neplatný."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr "Klúče s prázdnými hodnotami"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr "Neplatné vlastnosti kľúča"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr "Neplatná medzera vo vlastnosti klúča"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr "Hodnota začíná alebo končí medzerou"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr "Hodnota obsahuje HTML entitu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "Kľúč ''{0}'' sa nenachádza v zozname predvolených hodnôt."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr "Predvoľba neobsahuje vlastnosti kľúča"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "Hodnota ''{0}'' pre kľúč ''{1}'' nie je v predvolenom zozname."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr "Predvoľba neobsahuje vlastnost hodnoty"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr "Kontrola vlastností kľúčov."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Porovnáva hodnoty kľúčov oproti zoznamu slov."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr "Použíť komplexnú kontrolu vlastností"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr "Kontroluje platnosť hodnôt a značiek pomocou komplexných pravidiel."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr "Zdroj pre TagChecker"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -17046,86 +17153,86 @@
 "značiek."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr "Pridať nový zdroj do zoznamu."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr "Upraviť zvolený zdroj."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "Zmazať vybratý zdroj zo zoznamu."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "Zdroje dát"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr "Kontrola hodnôt vlastností."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr "Porovnáva platnosť hodnôt vlastností oproti prednastaveným hodnotám."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr "Kontrola pre FIXMES."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Vyhľadá body, alebo cesty s FIXME v hodnotách vlastností."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr "Kontrola pre poznámky (notes)"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr "Kontrola či pri kreslení mapy nevznikli chyby."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr "Použiť predvolený dátový súbor."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr "Použiť predvolený dátový súbor (doporučené)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr "Použite predvolený súbor pre ignorované značky."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr "Použite predvolený súbor pre ignorované značky (doporučené)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr "Použite predovlený súbor pre spellcheck (preklepy)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Použite predvolený súbor pre spellcheck (doporučené)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr "Oprava vlastností"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr "Nemôžem nájsť typ elementu"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr "Nemôžem nájsť úroveň varovania."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Neplatný výraz ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -17583,5 +17690,5 @@
 msgstr "WMS vrstva ({0}), sťahovaná vo zväčšení (zoom) {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -17596,64 +17703,64 @@
 "<br>Chcete doniesť WMS dlaždice aj napriek tomu?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr "Áno, stiahni obrázky"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr "Chybná URL?"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
-msgid ""
-"The requested area is too big. Please zoom in a little, or change resolution"
-msgstr ""
-"Požadovaná oblasť je príliš veľká. Prosím priblížte ju, alebo zmente oblasť."
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
 msgid "Download visible tiles"
 msgstr "Stiahnuť viditeľné dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+msgid ""
+"The requested area is too big. Please zoom in a little, or change resolution"
+msgstr ""
+"Požadovaná oblasť je príliš veľká. Prosím priblížte ju, alebo zmente oblasť."
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "Zmena rozlíšenia"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr "Nahrať poškodené dlaždice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr "Alfa kanál"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "Uložiť WMS vrstvu do súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr "Uložiť WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "Nahrať WMS vrstvu zo súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr "Načítať WMS vrstvu"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, 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:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr "Chyba formátu súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "Chyba pri nahrávaní súboru"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -17934,6 +18041,13 @@
 "Spúšťa FireFox na aktuálne viditeľné zobrazenie, ako pekný SVG obrázok."
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17944,15 +18058,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "Ohromný JGoodies Plastic Look and Feel."
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr "Necháva ostatné aplikácie poslať príkaz do JOSMu."
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17963,10 +18077,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr "Určuje trasové schopnosti"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17977,15 +18091,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "Povoľuje pridávanie značiek/bodov na aktuálnu gps pozíciu."
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "Určuje dialóg pre editáciu značiek v tabuľkovej mriežke."
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17998,10 +18112,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr "Vytvára radové domy mimo jednotlivých blokov."
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -18013,5 +18127,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -18022,5 +18136,5 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
@@ -18028,5 +18142,5 @@
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -18135,6 +18249,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -18142,6 +18265,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "Ref. číslo"
@@ -18158,5 +18282,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Jazdné pruhy"
@@ -18178,10 +18302,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Max. rýchlosť (km/h)"
@@ -18225,14 +18349,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "Jednosmerka"
@@ -18275,13 +18399,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -18319,13 +18443,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Tunel"
@@ -18360,13 +18484,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "Výkop"
@@ -18401,13 +18525,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "Násyp"
@@ -18539,4 +18663,13 @@
 msgid "Edit Unclassified Road"
 msgstr "Upraviť Neklasifikovanú cestu"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr ""
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -18554,15 +18687,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr "Šírka (v metroch)"
@@ -18574,5 +18707,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Ulica (miestna komunikácia)"
@@ -18581,5 +18714,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "Upraviť ulicu"
@@ -18597,16 +18730,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Povrch"
@@ -18628,166 +18764,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr "spevnený"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr "nespevnený"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr "asfalt"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr "betón (concrete)"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr "kov"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "drevo (wood)"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr "dlažobné kamene"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr "dlažbová kocka (cobblestone)"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "štrk (gravel)"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr "riečne kamene"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr "zhutnená(valcovaná)"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr "trávový obkladač(grass_paver)"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "tráva (grass)"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "piesok (sand)"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr "zem (ground)"
@@ -18795,5 +18938,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr "Obytná zóna"
@@ -18802,5 +18945,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr "Upraviť Obytnú zónu"
@@ -18808,5 +18951,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "Pešia zóna"
@@ -18815,5 +18958,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "Upraviť pešiu zónu"
@@ -18821,5 +18964,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr "Obslužná cesta (Service)"
@@ -18828,5 +18971,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr "Upraviť obslužnú cestu (Service)"
@@ -18836,18 +18979,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr "Typ obslužnej cesty (serviceway)"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr "ulička(bočna ulica)"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr "príjazdová cesta"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr "parkovacia ulička(parking_aisle)"
@@ -18855,5 +18998,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr "Parkovacia ulička (Parking Aisle)"
@@ -18863,5 +19006,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr "Upraviť parkovaciu uličku (Parking Aisle)"
@@ -18869,5 +19012,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "Cesta (neznámy typ)"
@@ -18876,5 +19019,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "Upraviť cestu neznámeho typu"
@@ -18883,20 +19026,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "Cestné obmedzenie"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "Upraviť cestné obmedzenie"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "Mýto (Toll)"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "Slepá ulica"
@@ -18904,9 +19047,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 msgid "Access"
 msgstr "Prístup"
 
 #. 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"
@@ -18917,6 +19061,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18928,4 +19070,5 @@
 #. 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"
@@ -18944,141 +19087,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+msgid "yes"
+msgstr "áno"
+
+#. 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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "private (len pre vlastníka)"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+msgstr "určený"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:219
+msgid "destination"
+msgstr "miesto určenia (cieľ)"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr "permissive (súhlas vlastníka pozemku)"
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr "farmársky (agricultural)"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-msgid "yes"
-msgstr "áno"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "private (len pre vlastníka)"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-msgstr "určený"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "miesto určenia (cieľ)"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr "permissive (súhlas vlastníka pozemku)"
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr "farmársky (agricultural)"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "nie"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr "Malé nákladná autá a dodávky"
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Nákladné vozidlá"
@@ -19093,10 +19244,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr "Kôň"
@@ -19112,10 +19263,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "Motocykel"
@@ -19130,27 +19281,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr "Motorové vozidlo"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr "Dopravná obsluha"
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr "Motorová loď"
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "Loď"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Min. rýchlosť (km/h)"
@@ -19158,25 +19301,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "Max. hmotnosť (ton)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr "Max. Výška(v metroch)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr "Max. Šírka (v metroch)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr "Max. Dĺžka (v metroch)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "Kruhový objazd"
@@ -19187,5 +19330,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "Upraviť kruhový objazd"
@@ -19205,10 +19348,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "dialnica (motorway)"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr "dialničná prípojka"
@@ -19230,10 +19373,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "cesta pre motorové vozidlá (trunk)"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr "prípojka cesty pre motorové vozidlá"
@@ -19255,10 +19398,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "cesta prvej triedy"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr "prípojka cesty I. triedy"
@@ -19280,5 +19423,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -19293,9 +19436,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "cesta tretej triedy"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr "cesta bez klasifikácie (unclassified)"
@@ -19309,9 +19452,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "obytná (osídlená)"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr "obytná zóna"
@@ -19341,10 +19484,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "obslužná (service)"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr "autobusová linka"
@@ -19374,5 +19517,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -19384,10 +19527,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Editácia mosta"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr "Upraviť Tunel"
@@ -19395,19 +19538,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Vedľajšie komunikácie"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "Stavba"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "Upraviť komunikáciu vo výstavbe"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "Križovatka"
@@ -19423,5 +19566,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "kruhový objazd (roundabout)"
@@ -19429,5 +19572,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr "Poľná cesta (Track)"
@@ -19436,40 +19579,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr "Upraviť Stopu (Track)"
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "Poľná cesta (Track)"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "štrk (gravel)"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "štrk (gravel)"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "štrk (gravel)"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "štrk (gravel)"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "štrk (gravel)"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr ""
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -19477,5 +19614,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -19483,37 +19620,32 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr "turistika"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "Horský bicykel"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
-msgstr "Náročná horská turistika"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
-msgstr "Vysokohorská turistika"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
-msgstr "Náročná vysokohorská turistika"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
-msgstr "Tažká vysokohorská turistika"
+msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "Cesta (chodník)"
@@ -19522,12 +19654,32 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "Upraviť cestu (chodník)"
 
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr "stredne pokročilý (intermediate)"
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
+
 #: build/trans_presets.java:489
-#, fuzzy
 msgid "Wheelchairs"
-msgstr "Invalidný vozík"
+msgstr ""
 
 #: build/trans_presets.java:490
@@ -19543,7 +19695,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "Upraviť cestu pre kone"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -19556,7 +19707,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "Upraviť cyklistickú cestu"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -19591,24 +19741,21 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "Aj tak spojiť"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "Upraviť chodník"
+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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Upraviť chodník"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr "Bicykle"
@@ -19616,5 +19763,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "Schody"
@@ -19624,5 +19771,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Upraviť únikové schody"
@@ -19630,10 +19777,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr "Cestné objekty"
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "Ďialničná križovatka"
@@ -19641,15 +19788,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "Upraviť diaľničnú križovatku"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "Číslo"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "Služby"
@@ -19657,5 +19804,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr "Upraviť servisnú stanicu (autoservis)"
@@ -19663,5 +19810,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -19694,17 +19842,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "Operátor"
@@ -19713,5 +19861,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "Semafor"
@@ -19721,5 +19869,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr "Typ prechodu pre chodcov"
@@ -19728,27 +19876,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr "neriadený"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr "semafor"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "ostrovček"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr "neoznačený"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr "Prechod pre jazdcov na koňoch"
@@ -19756,6 +19904,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr "Prechod pre cyklistov"
@@ -19764,11 +19912,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr "Prechod cez cestu s obsluhou"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr "Typy prechodov pre chodcov (UK viď. en.wikipedia.org)"
@@ -19776,31 +19924,31 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr "prechod pre chodcov (zebra)"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr "prechod pre chodcov (len čiarkované okraje)"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr "toucan (prechod pre chodcov a cyklistov, len čiarkované okraje)"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr "puffin (prechod pre chodcov a cyklistov, len čiarkované okraje)"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr ""
 "pegasus (prechod pre chodcov a jazdcov na koňoch, len čiarkované okraje)"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr "tiger (prechod pre chodcov a cyklistov žlté pruhy)"
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "Zastaviť (stop)"
@@ -19808,5 +19956,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr "Prechod pre chodcov"
@@ -19815,14 +19963,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr "Upraviť križovanie"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr "Typ mena (UK)"
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr "Malý kruhový objazd"
@@ -19833,14 +20027,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr "Smer"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr "v smere hodinových ručičiek (pravotočivý)"
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr "Turning Circle (zaokrúhlený koniec cesty pre ľahšie otáčanie sa aut)"
@@ -19850,26 +20044,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "Hranica mesta/obce"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "Upraviť označenie hranice mesta/obce"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr "Druhé meno"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 msgid "Speed Camera"
 msgstr "Kamera na meranie rýchlosti"
 
 #. 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "Núdzový telefón"
@@ -19877,5 +20073,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr "Sklon"
@@ -19883,5 +20079,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr "Prudký sklon"
@@ -19889,11 +20085,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr "Brod"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr "Upraviť brod"
@@ -19901,5 +20104,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr "Horský priesmyk"
@@ -19907,5 +20110,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr "Upraviť horský priesmyk"
@@ -19917,7 +20120,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "Nadmorská výška"
@@ -19925,5 +20128,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Prekážka (Barriers)"
@@ -19931,5 +20134,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr "Stĺpik"
@@ -19937,5 +20140,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr "Upraviť stĺpik"
@@ -19980,16 +20183,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "Povolená prevádzka:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr "Cyklo prekážka (Cycle Barrier)"
@@ -19998,5 +20201,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr "Balvan (Block)"
@@ -20004,5 +20207,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr ""
@@ -20012,5 +20215,5 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr ""
@@ -20019,5 +20222,5 @@
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr "Bus trap (rohož cez cestu zabraňujúca vjazdu vozidiel okrem autobusov)"
@@ -20025,15 +20228,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr "Špičky (hroty)"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr "Upraviť Hroty"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "Mýtna búdka"
@@ -20041,5 +20244,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "Upraviť mýtnu búdku"
@@ -20047,10 +20250,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr "Hraničná kontrola"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr "Upraviť hraničnú kontrolu"
@@ -20060,5 +20263,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr "Živý plot (Hedge)"
@@ -20067,12 +20270,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:817 build/trans_presets.java:819
 msgid "Fence"
 msgstr "Plot"
 
-#. item "Barriers/Fence"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "Hradby"
@@ -20080,5 +20295,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "Mestské hradby"
@@ -20087,5 +20302,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr "Oporný múr"
@@ -20097,15 +20312,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr "Vstup"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr "Upraviť vstup"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "Brána"
@@ -20113,50 +20329,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr "Upraviť bránu"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr "Závora (Lift Gate)"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr "Upraviť závoru (Lift Gate)"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr "Brána pre zvieratá (Hampshire)"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr "Upraviť bránu pre zvieratá (hampshire)"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr "Brána pre otváranie predkom auta (bump)"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr "Upraviť bránu pre otváranie predkom auta (bump)"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr "Automatická brána pre hospodárske zvieratá (Kissing)"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr "Upraviť automatickú bránu pre hosp. zvieratá (kissing)"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr "Turniket (Stile)"
@@ -20164,25 +20380,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr "Upraviť turniket"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr "Turniket"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr "Upraviť Turniket"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr "Sally port (vstupný portál do pevnosti s vonkajšou a vnútornou bránou)"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr ""
@@ -20195,11 +20411,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "Voda"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "Prameň"
@@ -20207,5 +20423,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "Upraviť prameň"
@@ -20213,5 +20429,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr "Odvodňovací kanál, odtok"
@@ -20219,10 +20435,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr "Upraviť odvodňovací kanál, odtok"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "Potok"
@@ -20230,10 +20457,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "Upraviť potok"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "Prieplav"
@@ -20241,10 +20468,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "Upraviť prieplav"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "Rieka"
@@ -20254,5 +20481,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "Upraviť rieku"
@@ -20260,15 +20487,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Upraviť vodu"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "Zem (Pevnina)"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "Upraviť Zem (Pevnina)"
@@ -20276,15 +20503,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr "Basin (Kotvisko pre lode)"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr "Upraviť Basin (Kotvisko pre lode)"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr "Nádrž"
@@ -20292,15 +20519,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr "Upraviť nádrž"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr "Krytá nádrž"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr "Upraviť krytú nádrž"
@@ -20308,5 +20535,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "Riečny breh"
@@ -20315,10 +20542,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "Upraviť riečny breh"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr "Mokraď"
@@ -20329,14 +20556,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr "Upraviť mokraď"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "Močiar"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr "slatina"
@@ -20350,35 +20577,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr "močiar (marsh)"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr "mokraď´s rákosím"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr "soľná bažina"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr "prílivová oblasť"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr "mangrovová oblasť"
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "Blato"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr "Upraviť blato"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "Pláž"
@@ -20386,20 +20613,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "Upraviť pláž"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "Záliv"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "Upraviť záliv"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "Útes"
@@ -20407,10 +20634,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "Upraviť útes"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "Pobrežie"
@@ -20418,5 +20645,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "Upraviť pobrežie"
@@ -20424,5 +20651,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "Prievoz, trajekt"
@@ -20430,5 +20657,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr "Upraviť prievoz, trajekt"
@@ -20437,5 +20664,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr "Lodenica"
@@ -20443,10 +20670,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr "Upraviť lodenicu"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "Dok, prístavná hrádza"
@@ -20454,5 +20681,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr "Upraviť dok, prístavnú hrádzu"
@@ -20460,5 +20687,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "Priehrada, nádrž"
@@ -20466,15 +20693,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "Upraviť priehradu, nádrž"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr "Vodné objekty"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr "Plavebná komora"
@@ -20483,5 +20710,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr "Priehradzka"
@@ -20489,20 +20716,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr "Upraviť priehradzku"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "Vodopád"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "Upraviť vodopád"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr "Turning Point (koniec cesty)"
@@ -20511,15 +20738,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr "Prístav (Marina)"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr "Upraviť Prístav (Marina)"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "Mólo"
@@ -20527,10 +20754,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "Upraviť mólo"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr "Prístavisko prievozu, trajektu"
@@ -20538,10 +20765,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr "Upraviť prístavisko prievozu, trajektu"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr "Slipway (rampa na vyzdvihnutie lode z vody na breh)"
@@ -20551,20 +20778,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr "Upraviť slipway (rampa na vyzdvihnutie lode z vody na breh)"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr "Preprava"
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "Železnica"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "Železnica (štandardná)"
@@ -20572,5 +20799,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr "Upraviť železničnú koľaj"
@@ -20579,139 +20806,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr "štandartný"
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr "železničná vlečka v závode"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr "vedľajšia koľaj (napr: na stanici)"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr "železničná vlečka"
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr "koľajnica (rail)"
+
+#. 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:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+msgid "Voltage"
+msgstr "Napätie"
+
+#. 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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr "Úzkorozchodná železnica"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr "Upraviť úzkorozchodnú železnicu"
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr "Jednokoľajka, vysutá dráha"
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr "Upraviť jednokoľajku, vysutú dráhu"
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr "Historická železnica"
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr "Upraviť zachovanú železnicu (v prevádzke)"
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr "Rýchloelektrička"
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr "Upraviť električku"
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "Metro"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "Upraviť metro"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "Električka"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr "Upraviť električku"
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr "Autobusová linka"
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr "Upraviť autobusovú linku"
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "Nepoužívaná železnica"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "Upraviť nepoužívanú železnicu"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr "Voliteľné typy"
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr "železničná vlečka v závode"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr "vedľajšia koľaj (napr: na stanici)"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr "železničná vlečka"
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr "Úzkorozchodná železnica"
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr "Upraviť úzkorozchodnú železnicu"
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr "Jednokoľajka, vysutá dráha"
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr "Upraviť jednokoľajku, vysutú dráhu"
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr "Historická železnica"
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr "Upraviť zachovanú železnicu (v prevádzke)"
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr "Rýchloelektrička"
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr "Upraviť električku"
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "Metro"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "Upraviť metro"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "Električka"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr "Upraviť električku"
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr "Autobusová linka"
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr "Upraviť autobusovú linku"
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "Nepoužívaná železnica"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "Upraviť nepoužívanú železnicu"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "Opustená železnica"
@@ -20720,5 +21186,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr "Železničné priecestie"
@@ -20727,5 +21193,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr "Peší prechod cez železnicu"
@@ -20735,5 +21201,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr "Typy prechodov cez cestu"
@@ -20741,5 +21207,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "Točňa"
@@ -20748,10 +21214,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr "Lanovka"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "Sedačková lanovka"
@@ -20759,10 +21232,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr "Upraviť sedačkovú lanovku"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr "Lyžiarsky vlek Drag_lift(nepoužíva sa, použite piste:lift=platter)"
@@ -20770,5 +21243,5 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr ""
@@ -20776,5 +21249,5 @@
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "Kabínková lanovka"
@@ -20782,10 +21255,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "Upraviť kabínkovú lanovku"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr "Gondola"
@@ -20793,10 +21266,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr "Upraviť Gondolu"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20804,12 +21277,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr "Upraviť stanicu"
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "Čerpacia stanica"
@@ -20819,9 +21305,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Upraviť čerpaciu stanicu"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20875,32 +21418,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "Otváracia doba"
@@ -20959,94 +21502,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Po-Pi 08:30-20:00"
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Ut-Ne 08:00-15:00; So 08:00-12:00"
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -21058,5 +21677,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -21066,5 +21685,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Upraviť parkovisko"
@@ -21075,25 +21694,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr "Referenčné číslo"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "mnohoposchodový"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "povrch"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr "podzemie"
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr "P+R parkovisko"
@@ -21102,48 +21721,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "Poplatok"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr "Kapacita (celková)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr "Miesta pre vozíčkárov"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr "Priestory pre ženy"
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr "Priestory pre rodičov s detmi"
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Pozrite Wiki pre iné typy capacity:[types]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "Umývačka"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "Upraviť umývačku aut"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "Servis"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "Upraviť autoservis"
@@ -21151,5 +21770,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "Požičovňa"
@@ -21158,10 +21777,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "Upraviť autopožičovňu"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr "Autopožičovňa (aj pre krátkodobé požičanie auta aj 1 hod.)"
@@ -21169,5 +21788,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr "Upraviť autopožičovňu (aj pre krátkodobé požičanie auta aj 1hod.)"
@@ -21175,10 +21794,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "Upraviť parkovisko bicyklov"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr "Kapacita"
@@ -21187,15 +21806,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "Upraviť požičovňu bicyklov"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Hromadná doprava"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -21205,5 +21824,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -21211,5 +21830,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -21217,5 +21836,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr "Železničná zastávka"
@@ -21223,5 +21842,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr "Upraviť zastávku"
@@ -21229,5 +21848,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "Zastávka električky"
@@ -21236,5 +21855,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "Upraviť zastávku električky"
@@ -21242,5 +21861,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "Železničné nástupište"
@@ -21249,5 +21868,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "Upraviť železničné nástupište"
@@ -21259,5 +21878,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr "Referencie (číslo stopy(track))"
@@ -21265,10 +21884,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr "Oblasť"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "Vchod do metra"
@@ -21277,10 +21896,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "Upraviť vchod do metra"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr "Invalidný vozík"
@@ -21289,5 +21908,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "Autobusová stanica"
@@ -21296,5 +21915,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "Upraviť autobusovú stanicu"
@@ -21302,5 +21921,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "Autobusová zastávka"
@@ -21310,5 +21929,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "Upraviť autobusovú zastávku"
@@ -21317,25 +21936,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr "Prístrešok"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "Lavička"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr "Autobusové nástupište"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr "Upraviť autobusové nástupište"
@@ -21343,5 +21963,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "Taxi"
@@ -21349,5 +21969,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "Upraviť stanicu taxíkov"
@@ -21355,32 +21975,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "Letisko"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr "Upraviť letisko"
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr "IATA"
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr "ICAO"
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+msgid "Beacon"
+msgstr "Signál (rádiomaják)"
+
+#. 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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr "Cestovanie"
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Ubytovanie"
@@ -21392,5 +22107,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -21399,15 +22114,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "Upraviť hotel"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "Hviezdičkový"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr "Motel"
@@ -21415,20 +22130,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr "Upraviť motel"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr "Penzión"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr "Upraviť penzión"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "Chata"
@@ -21436,10 +22151,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr "Upraviť chatu"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr "Ubytovňa"
@@ -21447,30 +22162,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr "Upraviť ubytovňu"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr "Horská chata"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr "Upraviť horskú chatu"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr "Kemping pre obytné prívesy"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr "Upraviť kemping pre obytné prívesy"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "Stanový tábor"
@@ -21478,10 +22193,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr "Upraviť stanový tábor"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Jedlo + Pitie"
@@ -21492,5 +22207,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Reštaurácia"
@@ -21498,5 +22213,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "Upraviť reštauráciu"
@@ -21504,5 +22219,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr "Kuchyňa"
@@ -21510,61 +22225,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "talianska"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "čínska"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "grécka"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "nemecká"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "indická"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "regionálna"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "turecká"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "ázijská"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "thajská"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "mexická"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "japonská"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "Rýchle občerstvenie"
@@ -21572,9 +22299,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "Upraviť reštauráciu rýchleho občerstvenia"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "Kaviareň"
@@ -21582,9 +22317,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "Upraviť kaviareň"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "Krčma"
@@ -21592,18 +22327,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "Upraviť krčmu"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr "Záhradná reštaurácia"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr "Upraviť záhradnú reštauráciu"
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr "Bar (výčap)"
@@ -21611,9 +22346,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr "Upraviť bar (výčap)"
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "Nočný klub"
@@ -21621,24 +22356,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "Upraviť nočný klub"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Turistika"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr "Atrakcia"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr "Upraviť atrakciu"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Múzeum"
@@ -21646,9 +22381,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Upraviť múzeum"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Zoo"
@@ -21657,9 +22392,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Upraviť zoo"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "Výhliadka"
@@ -21667,24 +22402,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "Upraviť výhliadku"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr "Výhliadková veža"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "Zábavný park"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr "Edit Theme Park"
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "Umelecké dielo"
@@ -21692,5 +22427,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "Upraviť umelecké dielo"
@@ -21698,19 +22433,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr "Informačná kancelária"
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr "Úroveň detailu"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr "topografická"
@@ -21748,5 +22483,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -21754,28 +22489,28 @@
 msgstr "pouličná sieť"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr "prehľadová (oreintačná)"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr "Zobrazená oblasť"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr "miesto (blízke okolie)"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr "mesto (city)"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr "oblasť (region)"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr "Bližší popis"
@@ -21785,5 +22520,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr "Zobrazené cesty sú pre:"
@@ -21791,5 +22526,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr "Turistika"
@@ -21797,6 +22532,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "Cyklistika"
@@ -21804,5 +22539,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr "Horský bicykel"
@@ -21810,6 +22545,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "Lyžovanie"
@@ -21817,5 +22552,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr "Jazdectvo"
@@ -21823,46 +22558,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr "... iný druh prepravy"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr "Informačná tabuľa"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr "Informačný panel s radami (board content)"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr "upozornenie"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "história"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr "príroda"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr "divoká príroda"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr "závod"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr "Rázcestník (ukazovateľ smeru)"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr "Informačný terminál"
@@ -21870,29 +22605,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr "Bližší popis"
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr "Audiosprievodcovia"
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr "Audiosprievodcovia cez mobilný telefón?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr "Číslo telefónu"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr "Ostatné (iné) informačné body (miesta)"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr "Upraviť prístrešok"
@@ -21900,25 +22635,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr "Ohnisko"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "Výletné miesto"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "Upraviť výletné miesto"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Historické miesta"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Hrad"
@@ -21927,19 +22662,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Upraviť hrad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Zrúcanina"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Upraviť zrúcaninu"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Archeologické nálezisko"
@@ -21948,9 +22683,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "Upraviť archeologické nálezisko"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "Bojisko"
@@ -21958,10 +22693,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "Upraviť bojisko"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr "Palaeontological Areál"
@@ -21969,5 +22704,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr "Upraviť Palaeontological Areál"
@@ -21975,15 +22710,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "Pamätihodnosť, pamätník"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "Upraviť pamätihodnosť, pamätník"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "Pomník"
@@ -21991,55 +22726,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "Upraviť pomník"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr "Kríž pri ceste"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr "Upraviť kríž pri ceste"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr "Božia muka"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr "Upraviť božiu muku"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr "Hraničné kamene"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr "Upraviť hraničné kamene"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Voľný čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "Vodný zábavný park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "Upraviť vodný zábavný park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Ihrisko"
@@ -22047,35 +22782,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Upraviť ihrisko"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Rybolov"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "Upraviť rybolov"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr "Športy"
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr "Športové zariadenie"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Štadión"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Upraviť štadión"
@@ -22089,6 +22824,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "vyberte šport:"
@@ -22480,6 +23215,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -22513,68 +23248,68 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "lukostreľba"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr "atletika"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "basketbal"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr "boules (spoločný názov pre hry hrajuce sa s kovovými guľami)"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr ""
 "bowls (gúľanie šišatej gule po umelej,alebo prírodnej tráve k malej guľke)"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr "kanoe"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "lezenie"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr ""
 "kriketová tréningová plocha s ochrannými sieťami (pre pálkára a nadhadzovača)"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr ""
@@ -22582,160 +23317,160 @@
 "trávnika)"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "bicyklovanie"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr "závody chrtov"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr "jazdectvo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "americký futbal"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "gymnastika"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr "konské dostihy"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr "automobilový"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr "racquetbal (podobné ako squash, iné pravidlá)"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr "ragby"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "streľba"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr "korčuľovanie"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "lyžovanie"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "futbal (soccer)"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "plávanie"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "stolný tenis"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "Športové centrum"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "Upraviť športové centrum"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr "Hracia plocha, ihrisko"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr "Upraviť hraciu plochu, ihrisko"
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr "Dostihová dráha"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr "Upraviť dostihovú dráhu"
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "Golfové ihrisko"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "Upraviť golfové ihrisko"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "Upraviť minigolf"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Šport"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr "Upraviť Multi"
@@ -22774,21 +23509,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "typ"
@@ -22827,203 +23562,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr "hracia plocha, ihrisko"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "športové centrum"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "štadión"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr "stopa"
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr "10pin (Kolok na hru s desiatimi kolkami)"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr "Upraviť 10pin (kolok na hru s desiatimi kolkami)"
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr "Atletika"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr "Upraviť atletiku"
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "Lukostreľba"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "Upraviť lukostreľbu"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "Lezenie"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "Upraviť lezenie"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr "Kanoistika"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr "Upraviť kanoistiku"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr "Upraviť cyklistiku"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "Preteky chrtov"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr "Upraviť preteky chrtov"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr "Jazdectvo"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr "Upraviť jazdectvo"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr "Konské dostihy"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr "Upraviť konské dostihy"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "Gymnastika"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr "Upraviť turistiku"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "Motošport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr "Upraviť motošport"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr "Korčuľovanie"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr "Upraviť korčuľovanie"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr "Upraviť Skateboard"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "Plávanie"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "Upraviť plávanie"
@@ -23031,56 +23766,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr "Upraviť lyžovanie"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr "Typ lyžiarskej dráhy"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr "zjazdárska"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr "beh nalyžiach hore kopcom (nordic)"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr "park zimných športov"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr "Obtiažnosť"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr "pre začiatočníkov"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr "ľahká"
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr "stredne pokročilý (intermediate)"
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr "pokročilý (advanced)"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr "pre skúsených"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr "freeride (zjazd na horských bicykloch cez prekážky)"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "Streľba"
@@ -23088,182 +23819,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "Upraviť streľbu"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "Šport (loptový)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "Futbal"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr "Upraviť futbal"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "Americký futbal"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr "Upraviť americký futbal"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr "Upraviť Australian Football"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "Bejzbal"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr "Upraviť bejzbal"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "Basketbal"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "Upraviť basketbal"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr "Upraviť golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "golfové ihrisko"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr "Bowling na tráve"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr "Upraviť bowling na tráve"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr "Bowling"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr "Upraviť bowling"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr "Upraviť kriket"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr "Cvičné ihrisko pre kriket so sieťou"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr "Upraviť cvičné ihrisko pre kriket so sieťou"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr "Upraviť kroquet"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "Upraviť hokej"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr "Upraviť polotu"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr "Racquetbal"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr "Upraviť racquetbal"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "Ragby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr "Upraviť ragby"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "Stolný tenis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "Upraviť stolný tenis"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "Upraviť tenis"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr "Človekom-Vytvorené (Man-Made)"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Budovy, stavby"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "Budova"
@@ -23271,5 +24002,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Verejná budova"
@@ -23277,10 +24008,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Upraviť verejnú budovu"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "Radnica (obecný úrad)"
@@ -23288,10 +24019,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Upraviť radnicu (obecný úrad)"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Veľvyslanectvo"
@@ -23299,10 +24030,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Upraviť veľvyslanectvo"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "Súd"
@@ -23311,10 +24042,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Upraviť súd"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Vezenie"
@@ -23323,10 +24054,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Upraviť súd"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Polícia"
@@ -23336,10 +24067,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Upraviť políciu"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "Hasičská stanica"
@@ -23348,10 +24079,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Upraviť hasičskú stanicu"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Pošta"
@@ -23359,5 +24090,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Upraviť poštu"
@@ -23365,15 +24096,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "Škôlka"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "Upraviť škôlku"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "Škola"
@@ -23381,10 +24112,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "Upraviť školu"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "Univerzita"
@@ -23392,10 +24123,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "Upraviť Univerzitu"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "Vysoká škola"
@@ -23403,5 +24134,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "Upraviť vysokú školu"
@@ -23409,5 +24140,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Kino"
@@ -23416,10 +24147,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Upraviť kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "Knižnica"
@@ -23428,9 +24159,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Upraviť knižnicu"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "Kultúrne stredisko"
@@ -23438,10 +24169,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "Upraviť kultúrne stredisko"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Divadlo"
@@ -23450,10 +24181,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Upraviť divadlo"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "Kostol"
@@ -23463,5 +24194,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "Upraviť kostol"
@@ -23470,6 +24201,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "Náboženstvo"
@@ -23478,66 +24209,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr "baháisti"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "budhisti"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "kresťania"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "hinduisti"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr "džinisti"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "judaisti"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "moslimovia"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr "spiritualisti"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr "taoisti"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr "unitársky"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr "Vyznanie (cirkevné)"
@@ -23546,81 +24277,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr "anglikánska"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "baptistická"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "katolícka"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr "evanjelikánska"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr "svedkovia jehovovi"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "lutheránska"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr "methodistická"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr "mormónska"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "orthodoxná"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr "presbiteriánska"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "protestanská"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr "quakerská"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr "šiítska"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr "sunnitská"
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Adresy"
@@ -23629,5 +24360,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Upraviť informácie o adrese"
@@ -23635,5 +24366,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "Číslo domu"
@@ -23641,25 +24372,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "Meno domu"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Názov ulice"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "Názov mesta"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Poštové smerovacie číslo"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "Kód krajiny"
@@ -23668,5 +24399,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "Upraviť interpoláciu adries"
@@ -23674,61 +24405,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr "Schéma číslovania"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "nepárne"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "párne"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr "abecedný"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr "Človekom vytvorené (Man made)"
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "Závody (továrne)"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "Upraviť závody (továrne)"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Veža"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Upraviť vežu"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr "Typ veže"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr "telekomunikačná"
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr "pozorovateľňa"
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr "Výška (metre)"
@@ -23736,25 +24467,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Vodojem"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Upraviť vodojem"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "Plynojem (Gasometer)"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "Upraviť plynojem (gasometer)"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "Maják"
@@ -23762,10 +24493,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Upraviť maják"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Veterný mlyn"
@@ -23773,10 +24504,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Upraviť veterný mlyn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Potrubie"
@@ -23785,37 +24516,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Upraviť potrubie"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
+msgid "gas"
+msgstr "plynová"
+
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr "teplo(heat)"
+
+#: build/trans_presets.java:2353
 msgid "oil"
 msgstr "ropa(oil)"
 
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-msgid "gas"
-msgstr "plynová"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr "splašky(sewage)"
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr "teplo(heat)"
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr "nejaké látky(any substance)"
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr "podvodné(underwater)"
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr "nadzemné(overground)"
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "Čistička odpadových vôd"
@@ -23825,10 +24556,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "Upraviť čističku odpadových vôd"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Žeriav"
@@ -23836,21 +24567,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Upraviť žeriav"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr "Signál (rádiomaják)"
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr "Upraviť signál (rádiomaják)"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "Meračský bod"
@@ -23858,10 +24584,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "Upraviť meračský bod"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "Pozorovanie (ostraha)"
@@ -23869,11 +24595,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Upraviť pozorovaciu kameru"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "Elektráreň (spôsob vyroby)"
@@ -23883,35 +24621,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "Upraviť elektráreň (spôsob vyroby)"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "veterná"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "vodná"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "fosílna"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "jadrová"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "uhoľná"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr "fotovoltanická (slnečná články)"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "Transformátorová stanica"
@@ -23920,10 +24658,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "Upraviť trafostanicu"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "Malý transformátor"
@@ -23932,5 +24670,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "Upraviť malý transformátor"
@@ -23938,10 +24676,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr "Odkazová linka"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "Elektrický stožiar (vysoké napätie)"
@@ -23952,23 +24690,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "Upraviť elektrický stožiar"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr "veža"
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr "stožiar(pole)"
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr "Nastavenie veže"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "Elektrické vedenie"
@@ -23977,79 +24715,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "Upraviť elektrické vedenie"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr "Typ vedenia"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr "vedenie"
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr "vedľajšie_vedenie"
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "Napätie"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr "Počet káblov"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr "jedno"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr "dvojité"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr "trojité"
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr "štvorité"
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr "Vybavenosť (Amenities)"
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Toalety"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr "Poznámka"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "Poštová schránka"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Telefón"
@@ -24058,5 +24791,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Upraviť telefón"
@@ -24064,5 +24797,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Mince"
@@ -24070,5 +24803,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "Bankovky"
@@ -24076,5 +24809,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr "Platobné karty a Kreditné karty"
@@ -24082,5 +24815,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr "Debetné karty"
@@ -24088,15 +24821,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Kreditné karty"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Telefónne karty"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Recyklácia"
@@ -24105,5 +24838,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Upraviť recykláciu (zber)"
@@ -24111,63 +24844,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "Batérie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "Plechovky"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "Handry"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "Sklo"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "Železný šrot"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+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:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr "Oreradlo chrbta (Backrest)"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr "Materiál"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr "kameň"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr "plast"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr "Farba"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr "čierna"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr "hnedá"
@@ -24246,5 +24990,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -24254,31 +24998,31 @@
 msgstr "zelená"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr "červená"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr "modrá"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr "šedá"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr "biela"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr "Počet sedadiel"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr "Poľovnícky posed"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr "Upraviť poľovnícky posed"
@@ -24287,30 +25031,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "Výška"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr "nízky"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr "polovičný"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr "úplný"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr "Skryť"
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr "Zamknúť"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "Fontána"
@@ -24319,10 +25063,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "Upraviť fontánu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "Pitná voda"
@@ -24331,10 +25075,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Upraviť pitnú vodu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr "Hniezdo záchrany"
@@ -24342,15 +25099,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr "Upraviť hniezdo záchrany"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Obchody"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr ""
@@ -24358,10 +25115,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "Upraviť obchod s autami"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr ""
@@ -24370,28 +25127,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "Upraviť bicyklový obchod"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "Upraviť supermarket"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr "Lekáreň"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr "Upraviť lekáreň"
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr "Obchod s polotovarmi"
@@ -24399,9 +25156,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr "Upraviť obchod s polotovarmi"
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "Stánok"
@@ -24409,27 +25166,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "Upraviť stánok"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr "Kníhkupectvo"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr "Upraviť kníhkupectvo"
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr "Cestovná kancelária"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr "Upraviť cestovnú kanceláciu"
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "Predajný automat"
@@ -24437,5 +25194,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "Upraviť predajný automat"
@@ -24443,88 +25200,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "Predávané výrobky"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr "lístky MHD"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr "plány MHD"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr "parkovacie lístky"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "jedlo"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "pitie"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "sladkosti"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "cigarety"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "fotky"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "krmivo pre zvieratá"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "noviny"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "hračky"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "známky"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "SIM-karty"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr "telefónne kupóny (poukážky)"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr "kupóny (poukážky)"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "kondómy"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr "tampóny"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr "sáčky na výkaly"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr "Prístupové alebo vernostné karty"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "Mäsiareň"
@@ -24532,9 +25289,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Upraviť mäsiarstvo"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "Chlieb a pečivo"
@@ -24542,9 +25299,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Upraviť chlieb a pečivo"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "Kvetinárstvo"
@@ -24552,18 +25309,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "Upraviť kvetinárstvo"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr "Biopotraviny"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr "Upraviť biopotraviny"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -24571,54 +25328,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr "Upraviť Obchod s alkoholickými nápojmi"
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr "Nápoje"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr "Upraviť Obchod s nápojmi."
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr "Počítač"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "Upraviť počítačový obchod"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr "Elektronika"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "Upraviť obchod s elektronikou"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr "Upraviť obchod s Hifi elektronikou"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr "Nábytok"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "Upraviť obchod s nábytkom"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr "Záhradné centrum"
@@ -24626,9 +25383,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr "Upraviť záhradné centrum"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr "Železiarstvo"
@@ -24636,9 +25393,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr "Upraviť železiarstvo"
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "Obchod Urob si sám"
@@ -24646,54 +25403,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "Upraviť obchod Urob si sám"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr "Papierníctvo"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr "Upraviť papierníctvo"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "Kaderníctvo"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "Upraviť kaderníctvo"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr "Obuva"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "Upravit obchod s obuvou"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr "Hračky"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "Upraviť obchod s hračkami"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr "Obchod s DVD"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr "Upraviť obchod s DVD"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Chemická čistiareň"
@@ -24701,9 +25458,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Upraviť chemickú čistiareň"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Práčovňa"
@@ -24711,9 +25468,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Upraviť práčovňu"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr "Turistický (Outdoor)"
@@ -24721,28 +25478,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr "Upraviť obchod s výchádzkovým (outdoor) tovarom"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr "Upraviť športový obchod"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr "Optik"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "Upraviť očnú optiku"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Hotovosť"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Banka"
@@ -24750,14 +25507,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Upraviť banku"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Zmenáreň"
@@ -24765,5 +25522,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Upraviť zmenáreň"
@@ -24771,15 +25528,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Upraviť bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Zdravie"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "Lekári"
@@ -24787,18 +25544,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "Upraviť lekárov"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "Zubný lekár"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "Upraviť zubného lekára"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Lekáreň"
@@ -24806,5 +25563,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Upraviť lekáreň"
@@ -24812,9 +25569,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr "výdaj na recepty"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Nemocnica"
@@ -24822,10 +25579,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Upraviť nemocnicu"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr "Pohotovosť (Záchranná služba)"
@@ -24834,5 +25591,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr "Upraviť pohotovosť (záchrannú službu)"
@@ -24841,20 +25598,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr "Číslo bodu"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr "Meno bodu(miesta)"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "Telefónne číslo"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Použite medzinárodný kód, ako +12-345-67890)"
@@ -24862,5 +25619,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "Veterinár"
@@ -24869,64 +25626,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "Upraviť veterinárnu ambulanciu"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr "Geografia(Zemepis)"
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Miesta"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Upraviť kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "Krajina (štát)"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Upraviť krajinu (štát)"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "Stav"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "Upraviť štát"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "Oblasť (región)"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "Upraviť oblasť (región)"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr "kraj (okres)"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr "Upraviť kraj (okres)"
@@ -24934,15 +25691,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "Mesto (city)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "Upraviť mesto"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "Mesto (town)"
@@ -24950,10 +25707,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "Upraviť mesto"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "Štvrť"
@@ -24961,25 +25718,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "Upraviť štvrť"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Dedina"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Upraviť dedinu"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "Malá dedina / osada / samota"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "Upraviť malú dedinu"
@@ -24987,5 +25744,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr "Oblasť (lokalita)"
@@ -24993,10 +25750,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr "Upraviť oblasť (lokalitu)"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "Ostrov"
@@ -25004,10 +25761,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Upraviť Ostrov"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr "Ostrovček"
@@ -25015,5 +25772,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr "Upraviť ostrovček"
@@ -25021,5 +25778,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "Vstup do jaskyne"
@@ -25027,10 +25784,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "Upraviť vstup do jaskyne"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Vrchol"
@@ -25038,10 +25795,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Upraviť vrchol kopca"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "Ľadovec"
@@ -25049,10 +25806,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "Upraviť ľadovec"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "Sopka"
@@ -25060,70 +25817,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "Upraviť sopku"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Hranice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "Štátna"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "Upraviť štátne hranice"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "Administratívne"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "Upraviť administratívne hranice"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr "Občianske"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr "Upraviť občiansku hranicu"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr "Politická"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "Upraviť politickú hranicu"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr "Národný park"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 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:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Využívanie oblasti (Land use)"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Strom"
@@ -25132,15 +25889,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Upraviť strom"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "Botanický názov"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "Drevo"
@@ -25149,5 +25906,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "Upraviť Drevo"
@@ -25155,17 +25912,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "ihličnatý"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "listnatý"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "zmiešaný"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "Les"
@@ -25174,14 +25931,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "Upraviť les"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "Prírodná rezervácia"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "Upraviť prírodnú rezerváciu"
@@ -25189,25 +25946,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr "Sutina"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr "Upraviť sutinu"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr "Krovie"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr "Upraviť krovie"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr "Fell (typ horskej krajiny nad pásmom stromov (horská pastvina))"
@@ -25215,5 +25972,5 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr ""
@@ -25221,5 +25978,5 @@
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr "Vresovisko"
@@ -25227,5 +25984,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "Upraviť vresovisko"
@@ -25233,5 +25990,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr "Farma"
@@ -25240,45 +25997,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr "Upraviť farmu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "Poľnohospodárska pôda"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr "Upraviť poľnohospodárske pôdu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr "Lúka"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr "Upraviť lúku"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "Vinica"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "Upraviť vinicu"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr "Ťažobný priestor"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr "Upraviť ťažobný priestor"
@@ -25286,25 +26043,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "Záhrada"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "Upraviť záhradu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "Tráva"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr "Upraviť trávnatú plochu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr "Obecná zeleň"
@@ -25312,10 +26069,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr "Upraviť obecnú zeleň"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr "Spoločné, obecné"
@@ -25323,20 +26080,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr "Upraviť spoločné, obecné"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "Upraviť park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr "Rekreačná oblasť"
@@ -25344,5 +26101,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr "Upraviť rekreačnú oblasť"
@@ -25350,15 +26107,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "Osídlená oblasť (Residential area)"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr "Upraviť osídlenú oblasť"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "Cintorín (malý, blizko kostola)"
@@ -25366,9 +26123,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Upraviť cintorín (malý, blizko kostola)"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "Cintorín"
@@ -25376,39 +26133,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "Upraviť cintorín"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "Maloobchod"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr "Upraviť oblasť s maloobchodmi"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "Obchodná (komerčná)"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr "Upraviť obchodnú (komerčnú) oblasť"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "Priemysel"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr "Upraviť priemyselnú oblasť"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr "Železničný pozemok"
@@ -25416,15 +26173,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr "Upraviť železničný pozemok"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "Armáda"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr "Upraviť vojenskú oblasť"
@@ -25432,50 +26189,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "Stavebná oblasť"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "Upraviť stavebnú oblasť"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr "Brownfield (opustený priemyselný objekt)"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr "Upraviť brownfield (opustený priemyselný objekt)"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr "Greenfield (oblasť používaná pre poľnohospodárstvo)"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr "Upraviť greenfield (oblasť používaná pre poľnohospodárstvo)"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr "Skládka odpadov"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr "Upraviť skládku odpadov"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "Lom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "Upraviť lom"
@@ -25485,5 +26242,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr "Upraviť multipolygón"
@@ -25492,10 +26249,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr "obvodová časť (outer segment)"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr "vnútorná časť (inner segment)"
@@ -25503,5 +26260,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr "Prikázané smery jazdy (turn restriction)"
@@ -25510,5 +26267,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr "Upraviť prikázané smery jazdy (turn restriction)"
@@ -25516,34 +26273,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr "Obmedzenie"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr "zákaz zabočenia vľavo"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr "zákaz zabočenia vpravo"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr "zákaz jazdy priamo"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr "zákaz otáčania sa"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr "prikázané odbočenie vpravo"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr "prikázané odbočenie vľavo"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr "zákaz odbočenia"
@@ -25552,15 +26309,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr "z cesty"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr "cez bod alebo cestu"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr "k ceste"
@@ -25568,5 +26325,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr "Cesta (Route)"
@@ -25575,5 +26332,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr "Upraviť Cestu (Route)"
@@ -25581,5 +26338,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr "Typ Cesty (Route)"
@@ -25670,5 +26427,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -25678,17 +26435,17 @@
 msgstr "bicykel"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr "cesta (vozovka)"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr "trajekt (prievoz)"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr "lyžovanie"
@@ -25748,5 +26505,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -25755,9 +26512,9 @@
 msgstr "pešia (foot)"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr "električka"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr "obchádzka"
@@ -25771,10 +26528,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "metro (subway)"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr "Popis značky"
@@ -25782,31 +26539,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr "Sieť"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr "Štátna cesta"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr "plánovaný"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr "náhradný"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr "dočasný"
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr "spojenie"
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr "Farba (hex)"
@@ -25815,107 +26572,32 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr "cestný úsek"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr "predný segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr "zadný segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr "bod prerušenia"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr "predný bod prerušenia"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 msgid "backward halt point"
 msgstr "zadný bod prerušenia"
-
-#. <!--
-#. 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 "štandartný"
 
 #. mappaint style named "standard"
@@ -26451,77 +27133,4 @@
 msgid "highway_track"
 msgstr "cesta (highway_track)"
-
-#. 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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
-msgstr "koľajnica (rail)"
 
 #. color rail
@@ -26909,7 +27518,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "baptistická"
+msgstr ""
 
 #. color manmade
@@ -30048,197 +30656,4 @@
 msgstr "Sicily - Italy"
 
-#~ msgid "The plugin could not be removed. Probably it was already disabled"
-#~ msgstr "Plugin nemôže byť odstránený. Pravdepodobne to bolo už vypnuté."
-
-#~ msgid "Bridleway"
-#~ msgstr "Cesta pre kone"
-
-#~ msgid "Cycleway"
-#~ msgstr "Cesta pre cyklistov"
-
-#~ msgid "Footway"
-#~ msgstr "Chodník"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "Kvalita stopy poľnej cesty 1"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Upraviť kvalitu stopy poľnej cesty 1"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Kvalita stopy poľnej cesty 2"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Upraviť kvalitu stopy poľnej cesty 2"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Kvalita stopy poľnej cesty 3"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Upraviť kvalitu stopy poľnej cesty 3"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "Kvalita stopy poľnej cesty 4"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Upraviť kvalitu stopy poľnej cesty 4"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Kvalita stopy poľnej cesty 5"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Upraviť kvalitu stopy poľnej cesty 5"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "Upraviť Turistiku"
-
-#~ msgid "Mountain Hiking"
-#~ msgstr "Horská turistika"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Upraviť horskú turistiku"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Upraviť náročnú horskú turistiku"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Upraviť vysokohorskú turistiku"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Upraviť náročnú vysokohorskú turistiku"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Upraviť ťažkú vysokohorskú turistiku"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "vyžadované Id > 0, dostal som {0}"
-
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "Parameter ''{0}'' nesmie byť nulový"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parameter ''{0}'' nesmie byť nulový"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "očakávaný príklad z OsmDataLayer alebo GpxLayer. Got ''{0}''."
-
-#~ msgid ""
-#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
-#~ "This can lead to nodes being deleted accidentally.\n"
-#~ "Are you really sure to continue?"
-#~ msgstr ""
-#~ "Vybratá cesta(y) ma body mimo sťahovanej oblasti dát.\n"
-#~ "Toto môže viesť k tomu, že body môžu byť náhodou vymazané.\n"
-#~ "Ste si naozaj istý, že chcete pokračovať?"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr ""
-#~ "Nemôžem obnoviť(undo) príkaz ''{0}'' pretože vrstva ''{1}'' už viac nie "
-#~ "je prítomná."
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "Údaj(parameter) ''{0}'' nesmie byť prázdny"
-
-#~ msgid "Expected array of length 4, got {0}"
-#~ msgstr "Očakávaná dĺžka sady 4. dostal som {0}"
-
-#~ msgid "Illegal double value ''{0}''"
-#~ msgstr "Nedovolená zdvojená hodnota ''{0}''"
-
-#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
-#~ msgstr "Parameter ''{0}'' > 0.0 očakávaný, dostal som {1}"
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "očekávané id >= 0. Got {0}"
-
-#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
-#~ msgstr "parameter ''{0}'' je nesprávny typ mena, dostava ''{1}''"
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "parameter ''{0}''je neprijateľná trieda, dostáva ''{1}''"
-
-#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
-#~ msgstr "Parameter ''{0}'' > 0 očakávaný, dostal som {1}"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr "parameter ''{0}'' v rozsahu 0..{1} očakávaný, dostáva {2}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "parameter {0} > 0 požadovaný. Dostal {1}."
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "aktuálny parameter je mimo rozsahu: got {0}"
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "neočakávaný index stĺpca. Got {0}"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "Parameter 'col'  musí byť 0 alebo 1. Got {0}"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "parameter ''{0}'' nemôže byť prázdny"
-
-#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
-#~ msgstr ""
-#~ "parameter ''{0}'' je očakávaný so značkami pre presne jeden kľúč. Got {1}"
-
-#~ msgid "Dialog not created yet. Invoke createInstance() first"
-#~ msgstr "Dialóg ešte nie je vytvorený. Odvoláva sa na createInstance() first"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Konflikt v dátach"
-
-#~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
-#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
-#~ "the new role?</html>"
-#~ msgstr ""
-#~ "<html>Nastavujete prázdnu funkciu na {0} pôvodných.<br>Toto sa rovná "
-#~ "vymazaniu funkcie z týchto pôvodných.<br>Skutočne chcete použiť novú "
-#~ "funkciu?</html>"
-
-#~ msgid "Value of child.getId() > 0 expected. Got {1}."
-#~ msgstr "child.getId() >0 očakávaný. Got {1}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
-#~ msgstr "Parameter ''{0}'' > 0 očakávaný. Dostal som {1}."
-
-#~ msgid "id in parameter ''{0}'' > 0 expected, got {1}."
-#~ msgstr "id s parametrom ''{0}'' > 0 očakávaný. dostal som {1}."
-
-#~ msgid "Object id > 0 expected. Got {0}"
-#~ msgstr "Objekt id > 0 očakávaný. Dostal som {0}"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "obrázok"
-#~ msgstr[1] "obrázky"
-#~ msgstr[2] "obrázkov"
-
-#~ msgid "Illegal value for attribute ''uid''. Got ''{0}''."
-#~ msgstr "Neplatná hodnota pre vlastnosť ''uid''. Got ''{0}''"
-
-#~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
-#~ msgstr "Očakávaný príklad z OsmDataLayer. Got ''{0}''."
-
-#~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "id parameter ''{0}'' > 0 požadovaný. Got {1}"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
-#~ msgstr "parameter ''{0}'' >= 0 očakávaný, dostáva ''{1}''"
-
-#~ msgid "Expected value > 0 for parameter ''{0}'', got {1}"
-#~ msgstr "Očakávaná hodnota > 0 pre parameter ''{0}'', dostal som {1}"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "Plugin {0} požaduje JOSM aktualizáciu na verziu {1}."
-
-#~ msgid "<html>"
-#~ msgstr "<html>"
-
 #~ msgid "Move"
 #~ msgstr "Presunúť"
@@ -30423,8 +30838,4 @@
 #~ msgstr "Vybratý iba jeden bod"
 
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr ""
-#~ "Prosím vyberte cesty s takmer pravými uhlami pre vytvorenie pravouhlosti."
-
 #~ msgid "Can only edit help pages from JOSM Online Help"
 #~ msgstr "Nápovedu môžete upravovať iba z online nápovedy JOSM"
@@ -30479,4 +30890,10 @@
 #~ msgstr "súčastná odchylka: {0}s"
 
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "obrázok"
+#~ msgstr[1] "obrázky"
+#~ msgstr[2] "obrázkov"
+
 #~ msgid "timezone difference: "
 #~ msgstr "rozdiel časových pásiem: "
@@ -30496,7 +30913,4 @@
 #~ msgid "GPS end: {0}"
 #~ msgstr "Koniec GPS: {0}"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Zadaný čas nemôže byť rozparsovaný"
 
 #~ msgid "Login name (email) to the OSM account."
@@ -30701,9 +31115,30 @@
 #~ msgstr "YAHOO (WebKit GTK)"
 
+#~ msgid "Motorboat"
+#~ msgstr "Motorová loď"
+
+#~ msgid "Boat"
+#~ msgstr "Loď"
+
+#~ msgid "Footway"
+#~ msgstr "Chodník"
+
+#~ msgid "Edit Hiking"
+#~ msgstr "Upraviť Turistiku"
+
+#~ msgid "Edit Demanding Mountain Hiking"
+#~ msgstr "Upraviť náročnú horskú turistiku"
+
+#~ msgid "Edit Alpine Hiking"
+#~ msgstr "Upraviť vysokohorskú turistiku"
+
+#~ msgid "Edit Mountain Hiking"
+#~ msgstr "Upraviť horskú turistiku"
+
+#~ msgid "Mountain Hiking"
+#~ msgstr "Horská turistika"
+
 #~ msgid "Drawbridge"
 #~ msgstr "Padací most"
-
-#~ msgid "Station"
-#~ msgstr "Stanica"
 
 #~ msgid "Shop"
@@ -30754,7 +31189,4 @@
 #~ msgid "Add either site-josm.xml or Wiki Pages."
 #~ msgstr "Vložte buď site-josm.xml alebo wiki stránku"
-
-#~ msgid "Public"
-#~ msgstr "Verejné"
 
 #~ msgid "Empty member in relation."
@@ -30842,4 +31274,22 @@
 #~ "tlačítko myši a hýbte myšou. Výber: Kľuk."
 
+#~ msgid "Track Grade 3"
+#~ msgstr "Kvalita stopy poľnej cesty 3"
+
+#~ msgid "Track Grade 2"
+#~ msgstr "Kvalita stopy poľnej cesty 2"
+
+#~ msgid "Track Grade 1"
+#~ msgstr "Kvalita stopy poľnej cesty 1"
+
+#~ msgid "Track Grade 5"
+#~ msgstr "Kvalita stopy poľnej cesty 5"
+
+#~ msgid "Track Grade 4"
+#~ msgstr "Kvalita stopy poľnej cesty 4"
+
+#~ msgid "Bridleway"
+#~ msgstr "Cesta pre kone"
+
 #~ msgid "sports"
 #~ msgstr "Športový"
@@ -30850,4 +31300,13 @@
 #~ msgid "Set manually the Lambert zone (e.g. for locations between two zones)"
 #~ msgstr "Nastaviť ručne Lambert zone (e.g. for locations between two zones)"
+
+#~ msgid ""
+#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
+#~ "This can lead to nodes being deleted accidentally.\n"
+#~ "Are you really sure to continue?"
+#~ msgstr ""
+#~ "Vybratá cesta(y) ma body mimo sťahovanej oblasti dát.\n"
+#~ "Toto môže viesť k tomu, že body môžu byť náhodou vymazané.\n"
+#~ "Ste si naozaj istý, že chcete pokračovať?"
 
 #~ msgid "AgPifoJ - Geotagged pictures"
@@ -30945,7 +31404,4 @@
 #~ msgstr "cykloturistická mapa"
 
-#~ msgid "board"
-#~ msgstr "tabuľa"
-
 #~ msgid "Show Author Panel"
 #~ msgstr "Zobraziť panel autorov(spracovateľov)"
@@ -31035,4 +31491,7 @@
 #~ msgstr "TOTO JE EXPERIMENTÁLNE. Uložte vašu prácu a overte pred nahrávaním."
 
+#~ msgid "Cycleway"
+#~ msgstr "Cesta pre cyklistov"
+
 #~ msgid "Downloaded plugin information from {0} site"
 #~ msgid_plural "Downloaded plugin information from {0} sites"
@@ -31089,4 +31548,25 @@
 #~ msgstr "Aktualizácia pluginov"
 
+#~ msgid "Edit Track of grade 1"
+#~ msgstr "Upraviť kvalitu stopy poľnej cesty 1"
+
+#~ msgid "Edit Track of grade 2"
+#~ msgstr "Upraviť kvalitu stopy poľnej cesty 2"
+
+#~ msgid "Edit Track of grade 3"
+#~ msgstr "Upraviť kvalitu stopy poľnej cesty 3"
+
+#~ msgid "Edit Track of grade 4"
+#~ msgstr "Upraviť kvalitu stopy poľnej cesty 4"
+
+#~ msgid "Edit Track of grade 5"
+#~ msgstr "Upraviť kvalitu stopy poľnej cesty 5"
+
+#~ msgid "Edit Demanding Alpine Hiking"
+#~ msgstr "Upraviť náročnú vysokohorskú turistiku"
+
+#~ msgid "Edit Difficult Alpine Hiking"
+#~ msgstr "Upraviť ťažkú vysokohorskú turistiku"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Upraviť padací most"
@@ -31112,7 +31592,4 @@
 #~ msgid "Add a new tagging preset source to the list."
 #~ msgstr "Pridať novýzdroj predvolieb značenia do obsahu."
-
-#~ msgid "Interpolation"
-#~ msgstr "Interpolácia (vloženie)"
 
 #~ msgid "Optional"
@@ -31266,4 +31743,7 @@
 #~ msgstr "Vyriešte rozpor v poradovom čísle relácie {0}"
 
+#~ msgid ">"
+#~ msgstr ">"
+
 #~ msgid "Apply partial resolutions"
 #~ msgstr "Použiť čiastočné rozhodnutie"
@@ -31271,4 +31751,7 @@
 #~ msgid "WARNING: unexpected value for preference conflict.resolution, got "
 #~ msgstr "POZOR: neočakávaná hodnota pre prednosť rozhodnutia konfliktu, got "
+
+#~ msgid "Plugin {0} requires JOSM update to version {1}."
+#~ msgstr "Plugin {0} požaduje JOSM aktualizáciu na verziu {1}."
 
 #~ msgid "Reached the end of the line"
@@ -31470,4 +31953,7 @@
 #~ msgstr "Kopírovať východzie"
 
+#~ msgid "Conflicts in data"
+#~ msgstr "Konflikt v dátach"
+
 #~ msgid "No data"
 #~ msgstr "Žiadne dáta"
@@ -31535,4 +32021,7 @@
 #~ msgstr "Nemôžem vyhľadávať, pretože nie sú načítané dáta."
 
+#~ msgid "Dialog not created yet. Invoke createInstance() first"
+#~ msgstr "Dialóg ešte nie je vytvorený. Odvoláva sa na createInstance() first"
+
 #~ msgid ""
 #~ "There are unsaved changes in the layer''{0}''. Delete the layer anwyay?"
@@ -31579,8 +32068,20 @@
 
 #~ msgid ""
+#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
+#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
+#~ "the new role?</html>"
+#~ msgstr ""
+#~ "<html>Nastavujete prázdnu funkciu na {0} pôvodných.<br>Toto sa rovná "
+#~ "vymazaniu funkcie z týchto pôvodných.<br>Skutočne chcete použiť novú "
+#~ "funkciu?</html>"
+
+#~ msgid ""
 #~ "Warning: failed to put history browser always on top. Exception was: {0}"
 #~ msgstr ""
 #~ "Varovanie: neúspešné umiestnenie prehliadača histórie vždy hore. Výnimka "
 #~ "bola: {0}"
+
+#~ msgid "Expected instance of OsmDataLayer. Got ''{0}''."
+#~ msgstr "Očakávaný príklad z OsmDataLayer. Got ''{0}''."
 
 #~ msgid ""
@@ -31590,4 +32091,7 @@
 #~ "Neúspešné zatvorenie changeset {0}, budú zavreté po uplynutí časového "
 #~ "limitu servera. Výnimka bola: {1}"
+
+#~ msgid "The plugin could not be removed. Probably it was already disabled"
+#~ msgstr "Plugin nemôže byť odstránený. Pravdepodobne to bolo už vypnuté."
 
 #~ msgid ""
@@ -31742,4 +32246,7 @@
 #~ "verzie 0.6"
 
+#~ msgid "<html>"
+#~ msgstr "<html>"
+
 #~ msgid "Use an open changeset"
 #~ msgstr "Použiť a otvoriť zmenový súbor"
@@ -31791,7 +32298,25 @@
 #~ msgstr "Aktuálny zmenový súbor ja prázdny. Nemôžem nahrať dáta."
 
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "parameter ''{0}'' nesmie byť nulový"
+
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr "očakávaný príklad z OsmDataLayer alebo GpxLayer. Got ''{0}''."
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "neočakávaná hodnota. Dostal {0}"
 
+#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "parameter {0} > 0 požadovaný. Dostal {1}."
+
+#~ msgid "Expected ID >= 0. Got {0}."
+#~ msgstr "očekávané id >= 0. Got {0}"
+
+#~ msgid "Parameter ''{0}'' is not a valid type name. Got ''{1}''."
+#~ msgstr "parameter ''{0}'' je nesprávny typ mena, dostava ''{1}''"
+
+#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
+#~ msgstr "parameter ''{0}''je neprijateľná trieda, dostáva ''{1}''"
+
 #~ msgid "There's no primitive with version {0} in this history."
 #~ msgstr "Nie sú tam pôvodné s verziou {0} v tejto histórii"
@@ -31800,4 +32325,7 @@
 #~ msgstr "Nie je tam platná verzia pri dátume ''{0}'' v tejto histórii"
 
+#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
+#~ msgstr "parameter ''{0}'' v rozsahu 0..{1} očakávaný, dostáva {2}"
+
 #~ msgid "No earliest version found. History is empty."
 #~ msgstr "nenájdená predchádzajúca verzia. História je prázdna."
@@ -31806,4 +32334,20 @@
 #~ msgstr "nenájdená staršia verzia. História je prázdna."
 
+#~ msgid "Parameter current out of range. Got {0}."
+#~ msgstr "aktuálny parameter je mimo rozsahu: got {0}"
+
+#~ msgid "Unexpected column index. Got {0}."
+#~ msgstr "neočakávaný index stĺpca. Got {0}"
+
+#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
+#~ msgstr "Parameter 'col'  musí byť 0 alebo 1. Got {0}"
+
+#~ msgid "Parameter ''{0}'' must not be empty."
+#~ msgstr "parameter ''{0}'' nemôže byť prázdny"
+
+#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
+#~ msgstr ""
+#~ "parameter ''{0}'' je očakávaný so značkami pre presne jeden kľúč. Got {1}"
+
 #~ msgid "Index out of bounds. Got {0}."
 #~ msgstr "index je mimo hranice Dostať {0}"
@@ -31812,6 +32356,12 @@
 #~ msgstr "Zobraziť priebeh z vybraných pôvodných"
 
+#~ msgid "Value of child.getId() > 0 expected. Got {1}."
+#~ msgstr "child.getId() >0 očakávaný. Got {1}"
+
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Nemôžem čítať \"{0}\""
+
+#~ msgid "Illegal value for attribute ''uid''. Got ''{0}''."
+#~ msgstr "Neplatná hodnota pre vlastnosť ''uid''. Got ''{0}''"
 
 #~ msgid ""
@@ -31826,4 +32376,10 @@
 #~ "nedovolená hodnota pre povinný atribút ''{0}''  typu int (>=0), dostáva "
 #~ "''{1}''"
+
+#~ msgid "ID parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "id parameter ''{0}'' > 0 požadovaný. Got {1}"
+
+#~ msgid "Parameter ''{0}'' >= 0 expected. Got ''{1}''."
+#~ msgstr "parameter ''{0}'' >= 0 očakávaný, dostáva ''{1}''"
 
 #~ msgid ""
@@ -31849,4 +32405,13 @@
 #~ "Niekoľko pomôcok(utilities) ktoré vám uľahčia život(prácu): napr. "
 #~ "zjednodušenie cesty, spojiť plochy, skok na pozíciu."
+
+#~ msgid ""
+#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
+#~ msgstr ""
+#~ "Nemôžem obnoviť(undo) príkaz ''{0}'' pretože vrstva ''{1}'' už viac nie "
+#~ "je prítomná."
+
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "Parameter ''{0}'' nesmie byť nulový"
 
 #~ msgid ""
@@ -31878,4 +32443,10 @@
 #~ msgid "Group common Address Interpolation inputs in a single dialog,"
 #~ msgstr "Zoskupiť bežné Address Interpolation vstupy do jedného dialógu."
+
+#~ msgid "Parameter ''{0}'' must not be empty"
+#~ msgstr "Údaj(parameter) ''{0}'' nesmie byť prázdny"
+
+#~ msgid "Illegal double value ''{0}''"
+#~ msgstr "Nedovolená zdvojená hodnota ''{0}''"
 
 #~ msgid "Failed to load load resource ''{0}''. Error is {1}"
@@ -31947,4 +32518,25 @@
 #~ msgstr "Vyhľadávanie dostupných prekladov..."
 
+#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+#~ msgstr "Parameter ''{0}'' > 0.0 očakávaný, dostal som {1}"
+
+#~ msgid "Expected array of length 4, got {0}"
+#~ msgstr "Očakávaná dĺžka sady 4. dostal som {0}"
+
+#~ msgid "Id > 0 required, got {0}"
+#~ msgstr "vyžadované Id > 0, dostal som {0}"
+
+#~ msgid "Object id > 0 expected. Got {0}"
+#~ msgstr "Objekt id > 0 očakávaný. Dostal som {0}"
+
+#~ msgid "id in parameter ''{0}'' > 0 expected, got {1}."
+#~ msgstr "id s parametrom ''{0}'' > 0 očakávaný. dostal som {1}."
+
+#~ msgid "Parameter ''{0}'' > 0 expected. Got {1}."
+#~ msgstr "Parameter ''{0}'' > 0 očakávaný. Dostal som {1}."
+
+#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
+#~ msgstr "Parameter ''{0}'' > 0 očakávaný, dostal som {1}"
+
 #~ msgid "Loading available locales..."
 #~ msgstr "Nahrávam dostupné likality..."
@@ -31953,4 +32545,7 @@
 #~ msgstr "Kontrolujem lokality..."
 
+#~ msgid "Expected value > 0 for parameter ''{0}'', got {1}"
+#~ msgstr "Očakávaná hodnota > 0 pre parameter ''{0}'', dostal som {1}"
+
 #~ msgid "Delete old plugin file {0}"
 #~ msgstr "Zmazať staršie súbory pluginov {0}"
Index: applications/editors/josm/i18n/po/sl.po
===================================================================
--- applications/editors/josm/i18n/po/sl.po	(revision 19689)
+++ applications/editors/josm/i18n/po/sl.po	(revision 19698)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 23:20-0500\n"
-"PO-Revision-Date: 2010-01-18 13:32-0500\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-23 21:54+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Slovenian <sl@li.org>\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-01-13 18:28+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -71,11 +71,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -236,5 +236,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -248,13 +248,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -263,5 +263,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -287,5 +290,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr ""
@@ -314,5 +317,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -379,9 +382,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -389,5 +392,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "V redu"
@@ -438,6 +443,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -455,5 +460,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -462,11 +467,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -503,5 +508,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "konflikt"
@@ -632,14 +637,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Kopiraj izbrane predmete v odložišče"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Izberite predmete, ki jih želite kopirati."
@@ -670,8 +675,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -680,5 +685,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -740,15 +745,10 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "Napake pri sprejemu"
-msgstr[1] "Napake pri sprejemu"
-msgstr[2] "Napake pri sprejemu"
-msgstr[3] "Napake pri sprejemu"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -769,4 +769,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -776,4 +778,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Podvoji izbrano z zaporednima ukazoma kopiraj in prilepi."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Podvoji"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "Pomakni izbranega člana vrstico višje."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr ""
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "Povečava na {0}"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr ""
 
 #. <button label="Info" hotkey="I">
@@ -864,12 +894,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 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] "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šč."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -988,5 +1015,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr ""
@@ -1136,5 +1163,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr ""
 
@@ -1148,11 +1175,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Odpri datoteko."
-msgstr[1] "Odpri datoteko."
-msgstr[2] "Odpri datoteko."
-msgstr[3] "Odpri datoteko."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1208,7 +1233,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1222,5 +1247,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "Premakne vozlišča tako, da so koti med njimi 90 ali 270 stopinj"
 
@@ -1256,4 +1282,8 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+msgid "Selection must consist only of ways and nodes."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
 msgid "Orthogonalize"
@@ -1267,4 +1297,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:204
 msgid "Selected Elements cannot be orthogonalized"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
 msgstr ""
 
@@ -1371,18 +1411,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1407,12 +1447,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Napaka"
@@ -1543,5 +1584,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1738,11 +1779,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "Razmnoži {0} vozlišč v {1} vozlišč"
-msgstr[1] "Razmnoži {0} vozlišč v {1} vozlišč"
-msgstr[2] "Razmnoži {0} vozlišč v {1} vozlišč"
-msgstr[3] "Razmnoži {0} vozlišč v {1} vozlišč"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1786,5 +1825,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr ""
@@ -2200,6 +2239,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2316,5 +2355,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Iskanje predmetov."
@@ -2496,5 +2535,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Iskanje"
@@ -2534,12 +2573,11 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "J"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
@@ -2547,10 +2585,10 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2560,9 +2598,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2695,11 +2733,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "Spremeni {0} predmetov"
-msgstr[1] "Spremeni {0} predmet"
-msgstr[2] "Spremeni {0} predmeta"
-msgstr[3] "Spremeni {0} predmete"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2749,12 +2785,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "Odstrani \"{0}\" pri {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Nastavi {0}={1} pri {2} {3}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2812,17 +2848,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Način za brisanje"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Izbrana GPS sled: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Izbriši izbrano relacijo"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2900,11 +2936,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "Spremeni {0} predmetov"
-msgstr[1] "Spremeni {0} predmet"
-msgstr[2] "Spremeni {0} predmeta"
-msgstr[3] "Spremeni {0} predmete"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -2957,6 +2991,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
@@ -2971,7 +3003,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Naj res izbrišem izbor iz relacije {0}?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3216,5 +3248,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3222,5 +3254,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3228,5 +3260,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3234,5 +3266,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3352,19 +3384,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3373,5 +3405,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3379,5 +3411,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3455,7 +3487,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:327
-#, fuzzy
 msgid "The \"to\" way does not start or end at a \"via\" node."
-msgstr "Izbrana pot ne vsebuje izbranega vozlišča."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
@@ -3501,6 +3532,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3512,5 +3543,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3523,7 +3554,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3547,5 +3578,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "ozadje"
@@ -3689,6 +3720,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3696,37 +3727,38 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "nepopoln"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "cesta"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "železnica"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "vodotok"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "raba tal"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3737,10 +3769,10 @@
 msgstr[3] "{0} točke"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3751,5 +3783,5 @@
 msgstr[3] "{0} člani"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3786,6 +3818,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Spor"
@@ -3796,7 +3828,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-#, fuzzy
-msgid "Authorization Failed"
-msgstr "Povezava ni uspela."
+msgid "Authorisation Failed"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
@@ -3993,5 +4024,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Pripravljanje"
@@ -4032,5 +4062,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4041,5 +4071,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Uredi"
@@ -4110,29 +4140,29 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Geografska dolžina pod kazalcem miške."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 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:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Geografska širina pod kazalcem miške."
 
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+msgid "The angle between the previous and the current way segment."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
-msgid "The 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:105
-msgid "The (compass) heading of the line segment being drawn."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
 msgid "The length of the new way segment being drawn."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4140,9 +4170,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(ni predmeta)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4302,11 +4332,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "konflikt"
-msgstr[1] "konflikt"
-msgstr[2] "konflikt"
-msgstr[3] "konflikt"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
@@ -4316,6 +4344,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
@@ -4370,16 +4396,16 @@
 msgstr "Odpravljanje sporov"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4575,8 +4601,12 @@
 msgstr "Vozlišče"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr "Združi vozlišča v najstarejšega"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4611,6 +4641,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
@@ -4628,6 +4656,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
@@ -4728,5 +4754,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr ""
@@ -4772,5 +4798,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -4900,10 +4931,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "brez"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr ""
@@ -4933,7 +4964,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-#, fuzzy, java-format
+#, java-format
 msgid "Tag collection does not include the selected value ''{0}''."
-msgstr "Izbrana pot ne vsebuje izbranega vozlišča."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
@@ -4983,7 +5014,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -4993,6 +5024,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5172,10 +5203,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5195,18 +5226,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Razreši"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5238,8 +5269,9 @@
 msgid ""
 "<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions won't be applied unless all differences<br>are "
-"resolved.Click <strong>{0}</strong> to close anyway."
-"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<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 ""
 
@@ -5262,5 +5294,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5269,5 +5301,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5347,43 +5379,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Plasti"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 msgid "Open a list of all loaded layers."
 msgstr "Odpri seznam vseh naloženih plasti."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Prikaži/skrij"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Podvoji izbrano pot."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 msgid "Move the selected layer one row up."
 msgstr "Pomakni izbrano plast vrstico višje."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Pomakni izbrano plast vrstico nižje."
@@ -5397,6 +5434,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Relacije"
@@ -5406,69 +5443,69 @@
 msgstr "Odpri seznam vseh relacij."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Odpri urejevalnik za izbrano relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Izbriši izbrano relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Ustvari novo relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Trenutni izbor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Odpri okno s seznamom izbora"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Povečava na izbrane predmete"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Povečava na ves izbor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5476,5 +5513,5 @@
 msgstr "Izbor"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5738,6 +5775,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331
@@ -5827,8 +5862,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -5900,4 +5933,7 @@
 #. <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 />
@@ -5976,6 +6012,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6017,6 +6054,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6485,152 +6524,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Naziv"
@@ -7013,5 +7054,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<različno>"
@@ -7070,55 +7111,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Latnosti: {0} / Članstva: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Lastnosti / Članstva"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Spremeni relacijo"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Naj res izbrišem izbor iz relacije {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Izbriši izbrani ključ vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Dodaj nov par ključ/vrednost vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Spremeni vrednost izbranega ključa vsem predmetom."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7158,6 +7199,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:345
@@ -7441,6 +7480,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
@@ -7564,47 +7601,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Zaznamki"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../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:187
+#: ../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:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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:212
+#: ../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:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr ""
@@ -7727,18 +7763,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -7749,34 +7785,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
 msgid "Enter a place name to search for:"
 msgstr "Vnesite ime kraja, ki ga želite poiskati:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+#: ../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:147
+#: ../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:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr ""
@@ -7787,7 +7823,9 @@
 #. 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" />
@@ -7796,10 +7834,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Vrsta"
@@ -7808,5 +7847,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -7818,17 +7857,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "neznan"
@@ -8173,5 +8211,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr ""
@@ -8536,6 +8574,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
@@ -8594,6 +8630,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500
@@ -8616,9 +8650,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8628,7 +8662,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -8640,16 +8674,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "Plast"
@@ -9062,68 +9096,68 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "točka GPS"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Use global settings."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Prilagodi barvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Privzeto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Izberite barvo"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Uvozi zvok"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9133,23 +9167,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Zvočne datoteke (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Uvozi slike"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9159,5 +9193,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9165,5 +9199,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9171,5 +9205,5 @@
 msgstr "Opis: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9179,23 +9213,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "Opis"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9204,5 +9238,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9211,10 +9245,10 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Pretvori v podatkovno plast"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9222,43 +9256,43 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "Sprejmi iz OSM vzdolž te sledi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Sprejmi vse znotraj:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9269,9 +9303,9 @@
 "nadaljevati?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 msgid "No GPX track available in layer to associate audio with."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9279,5 +9313,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9285,23 +9319,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "izven sprejetega področja"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9310,5 +9344,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9322,5 +9356,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9333,11 +9367,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9346,32 +9380,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} je sestavljen iz:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Pretvori v plast GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9424,28 +9458,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "Točke GPS sledi"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "Datoteke GPX (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Napaka pri razčlenjevanju {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Ni bilo možno prebrati \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9454,34 +9487,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 msgid "Gps time (read from the above photo): "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9489,64 +9522,64 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9555,48 +9588,46 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9605,5 +9636,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9611,41 +9642,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 msgid "The selected photos do not contain time information."
-msgstr "Izbrana pot ne vsebuje izbranega vozlišča."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
 "one."
-msgstr "Izbrana pot ne vsebuje izbranega vozlišča."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9654,5 +9683,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9661,65 +9690,63 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Berem {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Slike z geografskim položajem"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "Ni naloženih podatkov."
-msgstr[1] "Ni naloženih podatkov."
-msgstr[2] "Ni naloženih podatkov."
-msgstr[3] "Ni naloženih podatkov."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
 #, java-format
 msgid "{0} was found to be GPS tagged."
@@ -9727,13 +9754,11 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -9742,5 +9767,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -9833,5 +9858,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -9839,5 +9864,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -9846,29 +9871,29 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 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:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -9876,17 +9901,17 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Prikaži/skrij besedilo/ikone"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 msgid "Toggle visible state of the marker text and icons."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
+#: ../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 "
@@ -9894,5 +9919,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -9900,5 +9925,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr ""
@@ -9924,5 +9949,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
 #, java-format
 msgid ""
@@ -9930,5 +9955,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
 #, java-format
 msgid ""
@@ -9980,8 +10005,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize URL:"
-msgstr "Avtor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10071,8 +10094,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize now"
-msgstr "Avtor"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10131,7 +10152,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
-#, fuzzy
 msgid "OAuth authorization failed"
-msgstr "Povezava ni uspela."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
@@ -10211,8 +10231,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
-#| msgid "Please select at least four nodes."
 msgid "Please select an authorization procedure: "
-msgstr "Prosim, izberite vsaj 4 vozlišča."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10534,5 +10552,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Prosim izberite vrstico za urejanje."
@@ -10546,5 +10564,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10681,9 +10699,4 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -10713,6 +10726,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr ""
@@ -10751,8 +10764,8 @@
 msgstr "Enobarvno (barvo poimenovanih plasti je mogoče prilagoditi po meri)"
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Avtomobil"
@@ -10774,13 +10787,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Kolo"
@@ -10813,12 +10826,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr ""
@@ -10870,11 +10883,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
-#, fuzzy
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
 "draw all lines."
 msgstr ""
-"Največja razdalja (v metrih) med točkama, da med njima potegne črto. "
-"Nastavite ''-1'' za povezavo vseh točk."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
@@ -11777,5 +11787,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -11783,18 +11800,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -11805,16 +11822,16 @@
 msgstr "Vira prednastavitev ni bilo mogoče prebrati: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -11825,18 +11842,17 @@
 msgstr[3] "Spremeni {0} predmete"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "Uporabi prednastavitev"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Spremeni lastnosti"
@@ -12112,6 +12128,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12136,9 +12152,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12161,7 +12177,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
@@ -12233,5 +12255,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr ""
@@ -12332,11 +12354,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Spremeni {0} predmetov"
-msgstr[1] "Spremeni {0} predmet"
-msgstr[2] "Spremeni {0} predmeta"
-msgstr[3] "Spremeni {0} predmete"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -12869,6 +12889,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
@@ -12974,6 +12992,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13046,6 +13062,4 @@
 msgstr[0] ""
 msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:567
@@ -13241,5 +13255,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13247,8 +13260,4 @@
 "file a bug report."
 msgstr ""
-"Prišlo je do nepričakovane napake.\n"
-"\n"
-"To je vedno programerska napaka. Če uporabljate zadnjo različico \n"
-"urejevalnika JOSM, vas prosimo, da prijavite napako (podrobno, v angleščini)."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13340,6 +13349,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -13455,6 +13464,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13463,5 +13472,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -13602,4 +13611,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr ""
@@ -13690,5 +13700,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "Interpolacija naslovov"
@@ -14267,5 +14277,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr ""
@@ -14422,21 +14432,21 @@
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr ""
@@ -14468,9 +14478,9 @@
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -14485,13 +14495,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr ""
@@ -14500,6 +14510,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr ""
@@ -14725,17 +14735,17 @@
 msgstr "Naloži slike v novo plast."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../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:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -14779,42 +14789,41 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr ""
@@ -14870,6 +14879,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -14878,73 +14887,73 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../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:43
+#: ../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:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../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:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Ločljivost ploščic Landsat (pikslov na stopinjo)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Velikost ploščic Landsat (pikslov)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../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:55
+#: ../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:57
+#: ../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:59
+#: ../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:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr "Plast WMS"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../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:67
+#: ../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:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14952,5 +14961,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -14958,5 +14967,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14964,5 +14973,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -14970,53 +14979,53 @@
 "Ločljivost ploščic Landsat, merjena v pikslih na stopinjo. Privzeto 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../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:79
+#: ../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:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../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:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr ""
@@ -15040,5 +15049,5 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr ""
@@ -15069,5 +15078,5 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr ""
@@ -15142,5 +15151,5 @@
 msgstr "Kot med dvema izbranima vozliščema"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr ""
@@ -15397,4 +15406,74 @@
 #: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:135
 msgid "Firefox executable"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+msgid "Read error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Vpišite koordinate novega vozlišča."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Ohrani varnostne kopije datotek"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Napaka"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "Vpisanega časa ni bilo mogoče razpoznati."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Hkrati preimenuj datoteko"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Ohrani varnostne kopije datotek"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "Ohrani varnostne kopije datotek"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Prepiši"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+msgid "Could not delete temporary file!"
 msgstr ""
 
@@ -15668,6 +15747,6 @@
 msgstr "Vsako minuto shrani zajete podatke v datoteko."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -15789,72 +15868,128 @@
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+msgid "Terrace a house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+#, fuzzy
+msgid "Interpolation"
+msgstr "Interpolacija naslovov"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Ceste"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Številke ploščic"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Številke ploščic"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+msgid "Lowest housenumber of the terraced house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Ustvari novo relacijo"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Izbriši vozlišča ali poti"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Ime ceste"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../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:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr ""
@@ -16088,5 +16223,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr "Podvojena vozlišča"
@@ -16096,5 +16231,5 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16103,9 +16238,9 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr ""
@@ -16140,5 +16275,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr ""
@@ -16283,7 +16418,7 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr ""
@@ -16291,80 +16426,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16372,86 +16507,86 @@
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "Izbriši izbrani vir iz seznama."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "Viri podatkov"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr "Preveri vrednosti lastnosti."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr "Uporabi privzeto datoteko."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr "Uporabi privzeto datoteko (priporočeno)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr "Uporabi privzeto datoteko za črkovanje."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Uporabi privzeto datoteko za črkovanje (priporočeno)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr "Popravi lastnosti"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -16891,5 +17026,5 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -16900,63 +17035,63 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
-msgid ""
-"The requested area is too big. Please zoom in a little, or change resolution"
-msgstr ""
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
 msgid "Download visible tiles"
 msgstr "Naloži vidne ploščice"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
+msgid ""
+"The requested area is too big. Please zoom in a little, or change resolution"
+msgstr ""
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "Spremeni ločljivost"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "Shrani plast WMS v datoteko"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "Naloži plast WMS iz datoteke"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, 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:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -17207,6 +17342,13 @@
 msgstr ""
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17215,15 +17357,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17232,10 +17374,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17244,15 +17386,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17262,10 +17404,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17274,5 +17416,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17281,10 +17423,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -17391,6 +17533,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -17398,6 +17549,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr ""
@@ -17414,5 +17566,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Voznih pasov"
@@ -17434,10 +17586,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Najvišja hitrost (km/h)"
@@ -17481,14 +17633,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "Enosmerna"
@@ -17531,13 +17683,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -17575,13 +17727,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Predor"
@@ -17616,13 +17768,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "Usek"
@@ -17657,13 +17809,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "Nasip"
@@ -17794,4 +17946,13 @@
 #: build/trans_presets.java:225
 msgid "Edit Unclassified Road"
+msgstr ""
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
 msgstr ""
 
@@ -17810,15 +17971,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr ""
@@ -17830,5 +17991,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr ""
@@ -17837,5 +17998,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr ""
@@ -17853,16 +18014,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Površina"
@@ -17884,166 +18048,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr ""
@@ -18051,5 +18222,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr ""
@@ -18058,5 +18229,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr ""
@@ -18064,5 +18235,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr ""
@@ -18071,5 +18242,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr ""
@@ -18077,5 +18248,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr ""
@@ -18084,5 +18255,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr ""
@@ -18092,18 +18263,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr ""
@@ -18111,5 +18282,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr ""
@@ -18119,5 +18290,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -18125,5 +18296,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "Cesta (neznana kategorija)"
@@ -18132,5 +18303,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "Uredi cesto neznane kategorije"
@@ -18139,20 +18310,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "Cestne omejitve"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "Uredi cestne omejitve"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "Cestnina"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "Brez izhoda (slepa ulica)"
@@ -18160,9 +18331,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 msgid "Access"
 msgstr "Dostop"
 
 #. 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"
@@ -18173,6 +18345,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18184,4 +18354,5 @@
 #. 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"
@@ -18200,141 +18371,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+msgid "yes"
+msgstr "da"
+
+#. 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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr ""
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr ""
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr ""
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-msgid "yes"
-msgstr "da"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr ""
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr ""
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr ""
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr ""
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr ""
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -18349,10 +18528,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr ""
@@ -18368,10 +18547,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr ""
@@ -18386,27 +18565,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr ""
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr ""
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Najnižja hitrost (km/h)"
@@ -18414,25 +18585,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "Krožišče"
@@ -18443,5 +18614,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr ""
@@ -18461,10 +18632,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr ""
@@ -18486,10 +18657,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "hitra cesta"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr ""
@@ -18511,10 +18682,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "glavna"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr ""
@@ -18536,5 +18707,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -18549,9 +18720,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "regionalna (turistična)"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr ""
@@ -18565,9 +18736,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr ""
@@ -18597,10 +18768,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr ""
@@ -18630,5 +18801,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -18640,10 +18811,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Uredi most"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr ""
@@ -18651,19 +18822,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Poti"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr ""
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr ""
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr ""
@@ -18679,5 +18850,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "krožišče"
@@ -18685,5 +18856,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr ""
@@ -18692,35 +18863,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "Vrsta"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:460
+#: build/trans_presets.java:459
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -18728,5 +18898,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -18734,26 +18904,26 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
 msgstr ""
@@ -18761,5 +18931,5 @@
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "Steza"
@@ -18768,7 +18938,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "Uredi stezo"
+
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
 
 #: build/trans_presets.java:489
@@ -18788,7 +18979,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "Uredi most"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -18801,7 +18991,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "Uredi kolesarsko stezo"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -18841,18 +19030,16 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "Uredi pešpot"
+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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Uredi pešpot"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr ""
@@ -18860,5 +19047,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "Stopnice"
@@ -18868,5 +19055,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Uredi stopnice"
@@ -18874,10 +19061,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "Avtocestno križišče"
@@ -18885,15 +19072,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "Uredi avtocestno križišče"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr ""
@@ -18901,5 +19088,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr ""
@@ -18907,5 +19094,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -18938,17 +19126,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr ""
@@ -18957,5 +19145,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "Semafor"
@@ -18965,5 +19153,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -18972,27 +19160,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr ""
@@ -19000,6 +19188,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr ""
@@ -19008,11 +19196,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -19020,30 +19208,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "Stop znak"
@@ -19051,5 +19239,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -19058,14 +19246,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr ""
@@ -19076,14 +19310,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr "Obračališče"
@@ -19093,26 +19327,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "Znak za naselje"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "Uredi znak za naselje"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr ""
@@ -19120,5 +19356,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr ""
@@ -19126,5 +19362,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr ""
@@ -19132,11 +19368,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr ""
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr ""
@@ -19144,5 +19387,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr "Gorski prelaz"
@@ -19150,5 +19393,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr "Uredi gorski prelaz"
@@ -19160,7 +19403,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr ""
@@ -19168,5 +19411,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Ovire"
@@ -19174,5 +19417,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr "Stebriček"
@@ -19180,5 +19423,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr ""
@@ -19223,16 +19466,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr ""
@@ -19241,5 +19484,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr ""
@@ -19247,5 +19490,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr "Rešetka za živino"
@@ -19253,10 +19496,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr ""
@@ -19264,15 +19507,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "Cestninska postaja"
@@ -19280,5 +19523,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "Uredi cestninsko postajo"
@@ -19286,10 +19529,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr ""
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr ""
@@ -19299,5 +19542,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr ""
@@ -19306,12 +19549,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
-msgid "Fence"
-msgstr ""
-
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#: build/trans_presets.java:817 build/trans_presets.java:819
+msgid "Fence"
+msgstr ""
+
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr ""
@@ -19319,5 +19574,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr ""
@@ -19326,5 +19581,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr ""
@@ -19336,15 +19591,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "Vrata"
@@ -19352,50 +19608,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr ""
@@ -19403,25 +19659,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr ""
@@ -19432,11 +19688,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "Voda"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "Izvir"
@@ -19444,5 +19700,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "Uredi izvir"
@@ -19450,5 +19706,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr ""
@@ -19456,10 +19712,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "Potok"
@@ -19467,10 +19734,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "Uredi potok"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "Kanal"
@@ -19478,10 +19745,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "Uredi kanal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "Reka"
@@ -19491,5 +19758,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "Uredi reko"
@@ -19497,15 +19764,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Uredi vodo"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "Kopno"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "Uredi kopno"
@@ -19513,15 +19780,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr ""
@@ -19529,15 +19796,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -19545,5 +19812,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr ""
@@ -19552,10 +19819,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr ""
@@ -19566,14 +19833,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr ""
@@ -19587,35 +19854,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr ""
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr ""
@@ -19623,20 +19890,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr ""
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr ""
@@ -19644,10 +19911,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr ""
@@ -19655,5 +19922,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr ""
@@ -19661,5 +19928,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "Pot trajekta"
@@ -19667,5 +19934,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr ""
@@ -19674,5 +19941,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr "Ladjedelnica"
@@ -19680,10 +19947,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr "Uredi ladjedelnico"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "Dók"
@@ -19691,5 +19958,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr "Uredi dók"
@@ -19697,5 +19964,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "Jez"
@@ -19703,15 +19970,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "Uredi jez"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr "Vodna točka"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr "Vodna zapornica"
@@ -19720,5 +19987,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr ""
@@ -19726,20 +19993,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "Slap"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "Uredi slap"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr "Obračališče"
@@ -19748,15 +20015,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "Pomol"
@@ -19764,10 +20031,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "Uredi pomol"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr ""
@@ -19775,10 +20042,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr ""
@@ -19788,20 +20055,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "Železnica"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "Železniški tir"
@@ -19809,5 +20076,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr "Uredi železniški tir"
@@ -19816,139 +20083,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr ""
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr ""
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr ""
+
+#. item "Man Made/Power Line" text "Line reference"
+#. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
+#: build/trans_presets.java:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr "Tir ozkotirne železnice"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr "Uredi tir ozkotirne železnice"
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr ""
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr ""
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr ""
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "Podzemna"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "Uredi podzemno"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr ""
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr ""
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "Nerabljen tir"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "Uredi nerabljen tir"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr "Vrsta (neobvezno)"
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr ""
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr "Tir ozkotirne železnice"
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr "Uredi tir ozkotirne železnice"
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr ""
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr ""
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr ""
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr ""
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr ""
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr ""
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "Podzemna"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "Uredi podzemno"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr ""
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr ""
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr ""
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "Nerabljen tir"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "Uredi nerabljen tir"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "Zapuščeni tir"
@@ -19957,5 +20463,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr ""
@@ -19964,5 +20470,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr ""
@@ -19972,5 +20478,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr ""
@@ -19978,5 +20484,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "Okretnica"
@@ -19985,10 +20491,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr "Žičnica"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "Sedežnica"
@@ -19996,10 +20509,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr "Uredi sedežnico"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr "Vlečnica"
@@ -20007,10 +20520,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr "Uredi vlečnico"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "Kabinska žičnica"
@@ -20018,10 +20531,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "Uredi kabinsko žičnico"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr ""
@@ -20029,10 +20542,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20040,12 +20553,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr ""
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "Gorivo"
@@ -20055,9 +20581,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Uredi gorivo"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20111,32 +20694,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr ""
@@ -20195,94 +20778,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20294,5 +20953,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20302,5 +20961,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Uredi parkirišče"
@@ -20311,25 +20970,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr ""
@@ -20338,48 +20997,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr ""
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr ""
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr ""
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr ""
@@ -20387,5 +21046,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "Izposojevalnica"
@@ -20394,10 +21053,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "Uredi izposojevalnico avtomobilov"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr ""
@@ -20405,5 +21064,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr ""
@@ -20411,10 +21070,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr ""
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr ""
@@ -20423,15 +21082,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "Uredi izposojevalnico koles"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Javni prevoz"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -20441,5 +21100,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -20447,5 +21106,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr ""
@@ -20453,5 +21112,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr "Železniško postajališče"
@@ -20459,5 +21118,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr ""
@@ -20465,5 +21124,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr ""
@@ -20472,5 +21131,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr ""
@@ -20478,5 +21137,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "Železniški peron"
@@ -20485,5 +21144,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "Uredi železniški peron"
@@ -20495,5 +21154,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr ""
@@ -20501,10 +21160,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "Vhod v podzemno"
@@ -20513,10 +21172,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "Uredi vhod v podzemno"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr ""
@@ -20525,5 +21184,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "Avtobusna postaja"
@@ -20532,5 +21191,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "Uredi avtobusno postajo"
@@ -20538,5 +21197,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "Avtobusno postajališče"
@@ -20546,5 +21205,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "Uredu avtobusno postajališče"
@@ -20553,25 +21212,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr ""
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "Klopca"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr "Avtobusni peron"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr "Uredi avtobusni peron"
@@ -20579,5 +21239,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "Taksi"
@@ -20585,5 +21245,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "Uredi postajališče taksijev"
@@ -20591,32 +21251,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "Letališče"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr ""
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr ""
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr ""
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Nastanitev"
@@ -20628,5 +21383,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -20635,15 +21390,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr ""
@@ -20651,20 +21406,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr ""
@@ -20672,10 +21427,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr ""
@@ -20683,30 +21438,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr ""
@@ -20714,10 +21469,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Hrana in pijača"
@@ -20728,5 +21483,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
@@ -20734,5 +21489,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr ""
@@ -20740,5 +21495,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr ""
@@ -20746,61 +21501,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr ""
@@ -20808,9 +21575,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr ""
@@ -20818,9 +21593,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr ""
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "Pivnica"
@@ -20828,18 +21603,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "Uredi pivnico"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr ""
@@ -20847,9 +21622,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr ""
@@ -20857,24 +21632,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr ""
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Turizem"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Muzej"
@@ -20882,9 +21657,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Uredi muzej"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Živalski vrt"
@@ -20893,9 +21668,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Uredi živalski vrt"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "Razgledišče"
@@ -20903,24 +21678,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "Uredi razgledišče"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "Umetnina"
@@ -20928,5 +21703,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "Uredi umetnino"
@@ -20934,19 +21709,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Zemljevid"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr ""
@@ -20984,5 +21759,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -20990,28 +21765,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr ""
@@ -21021,5 +21796,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr ""
@@ -21027,5 +21802,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr ""
@@ -21033,6 +21808,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "Kolesarjenje"
@@ -21040,5 +21815,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr ""
@@ -21046,6 +21821,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "Smučanje"
@@ -21053,5 +21828,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr ""
@@ -21059,46 +21834,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr ""
@@ -21106,29 +21881,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr ""
@@ -21136,25 +21911,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Zgodovinski kraji"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Grad"
@@ -21163,19 +21938,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Uredi grad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Ruševine"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Uredi ruševine"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Arheološko najdišče"
@@ -21184,9 +21959,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "Uredi arheološko najdišče"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr ""
@@ -21194,10 +21969,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr ""
@@ -21205,5 +21980,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -21211,15 +21986,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr ""
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr ""
@@ -21227,55 +22002,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Prosti čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "Vodni park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "Uredi vodni park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Igrišče"
@@ -21283,35 +22058,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Uredi igrišče"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Ribarjenje"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "Uredi ribarjenje"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Uredi stadion"
@@ -21325,6 +22100,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "izberite šport:"
@@ -21716,6 +22491,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -21749,225 +22524,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "lokostrelstvo"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "košarka"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "plezanje"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "kolesarjenje"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "gimnastika"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "strelišče"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "smučanje"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "nogomet"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "plavanje"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "namizni_tenis"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "Športno središče"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "Uredi športno središče"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "Golf igrišče"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "Uredi golf igrišče"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "Uredi mini golf"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Šport"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr ""
@@ -22006,21 +22781,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "vrsta"
@@ -22059,203 +22834,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr ""
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "Lokostrelstvo"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "Uredi lokostrelstvo"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "Plezanje"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "Uredi plezanje"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr ""
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr "Uredi kolesarjenje"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "Pasje dirke"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr "Uredi pasje dirke"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr "Konjske dirke"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr "Uredi konjske dirke"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "Gimnastika"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr "Uredi gimnastiko"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr ""
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "Plavanje"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "Uredi plavanje"
@@ -22263,56 +23038,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr "Uredi smučanje"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr ""
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "Strelišče"
@@ -22320,182 +23091,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "Uredi strelišče"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "Šport (z žogo)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "Nogomet"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr "Uredi nogomet"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr ""
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr ""
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "Košarka"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "Uredi košarko"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr "Uredi golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "golf_igrišče"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr ""
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "Uredi hokej"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr ""
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr ""
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr ""
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "Namizni tenis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "Uredi namizni tenis"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "Uredi tenis"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Zgradbe"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "Zgradba"
@@ -22503,5 +23274,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Javne zgradbe"
@@ -22509,10 +23280,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Uredi javno zgradbo"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "Mestna hiša"
@@ -22520,10 +23291,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Uredi mestno hišo"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Veleposlaništvo"
@@ -22531,10 +23302,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Uredi veleposlaništvo"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "Sodišče"
@@ -22543,10 +23314,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Uredi sodišče"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Zapor"
@@ -22555,10 +23326,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Uredi zapor"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Policijska postaja"
@@ -22568,10 +23339,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Uredi policijsko postajo"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "Gasilski dom"
@@ -22580,10 +23351,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Uredi gasilski dom"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Pošta"
@@ -22591,5 +23362,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Uredi pošto"
@@ -22597,15 +23368,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "Šola"
@@ -22613,10 +23384,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "Uredi šolo"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr ""
@@ -22624,10 +23395,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr ""
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr ""
@@ -22635,5 +23406,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr ""
@@ -22641,5 +23412,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Kinematograf"
@@ -22648,10 +23419,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Uredi kinematograf"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "Knjižnica"
@@ -22660,9 +23431,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Uredi knjižnico"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr ""
@@ -22670,10 +23441,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Gledališče"
@@ -22682,10 +23453,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Uredi gledališče"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "Kraj čaščenja"
@@ -22695,5 +23466,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "Uredi kraj čaščenja"
@@ -22702,6 +23473,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "Vera"
@@ -22710,66 +23481,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr ""
@@ -22778,81 +23549,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Naslovi"
@@ -22861,5 +23632,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Urejanje podatkov o naslovu"
@@ -22867,5 +23638,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr ""
@@ -22873,25 +23644,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Ime ceste"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Poštna številka"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr ""
@@ -22900,5 +23671,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "Uredi interpolacijo naslovov"
@@ -22906,61 +23677,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Stolp"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Uredi stolp"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr ""
@@ -22968,25 +23739,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Vodni stolp"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Uredi vodni stolp"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "Svetilnik"
@@ -22994,10 +23765,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Uredi svetilnik"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Mlin na veter"
@@ -23005,10 +23776,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Uredi mlin na veter"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Cevovod"
@@ -23017,37 +23788,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Uredi cevovod"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
+msgid "gas"
+msgstr ""
+
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr ""
+
+#: build/trans_presets.java:2353
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-msgid "gas"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "Čistilna naprava"
@@ -23057,10 +23828,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "Uredi čistilno napravo"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Žerjav"
@@ -23068,21 +23839,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Uredi žerjav"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr ""
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "Geodetska točka"
@@ -23090,10 +23856,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "Uredi geodetsko točko"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "Video nadzor"
@@ -23101,11 +23867,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Uredi video nadzorno kamero"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr ""
@@ -23115,35 +23893,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr ""
@@ -23152,10 +23930,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr ""
@@ -23164,5 +23942,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -23170,10 +23948,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "Steber daljnovoda"
@@ -23184,23 +23962,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "Uredi steber daljnovoda"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr ""
@@ -23209,79 +23987,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr ""
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr ""
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Stranišča"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "Poštni nabiralnik"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Telefon"
@@ -23290,5 +24063,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Uredi telefon"
@@ -23296,5 +24069,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Kovanci"
@@ -23302,5 +24075,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "Bankovci"
@@ -23308,5 +24081,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -23314,5 +24087,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr "Debetne kartice"
@@ -23320,15 +24093,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Kreditne kartice"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Telefonske kartice"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Recikliranje"
@@ -23337,5 +24110,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Uredi raciklažno točko"
@@ -23343,31 +24116,42 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+msgid "Edit Waste Basket"
 msgstr ""
 
@@ -23375,31 +24159,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr ""
@@ -23478,5 +24262,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -23486,31 +24270,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -23519,30 +24303,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr ""
@@ -23551,10 +24335,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "Pitna voda"
@@ -23563,10 +24347,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Uredi pitno vodo"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr ""
@@ -23574,15 +24371,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Trgovine"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr ""
@@ -23590,10 +24387,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr ""
@@ -23602,28 +24399,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr ""
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr ""
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr ""
@@ -23631,9 +24428,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr ""
@@ -23641,27 +24438,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr ""
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "Prodajni avtomat"
@@ -23669,5 +24466,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "Uredi prodajni avtomat"
@@ -23675,88 +24472,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "Prodajani izdelki"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "pijača"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "SIM kartice"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "Mesar"
@@ -23764,9 +24561,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Uredi mesarja"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "Pekarna"
@@ -23774,9 +24571,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Uredi pekarno"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr ""
@@ -23784,18 +24581,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr ""
@@ -23803,54 +24600,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr ""
@@ -23858,9 +24655,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr ""
@@ -23868,9 +24665,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "Sam svoj mojster"
@@ -23878,54 +24675,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "Uredi sam svoj mojster trgovino"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr ""
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr ""
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Čistilnica"
@@ -23933,9 +24730,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Uredi čistilnico"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Pralnica"
@@ -23943,9 +24740,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Uredi pralnico"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr ""
@@ -23953,28 +24750,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr ""
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Denar"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Banka"
@@ -23982,14 +24779,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Uredi banko"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Menjalnica"
@@ -23997,5 +24794,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Uredi menjalnico"
@@ -24003,15 +24800,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Uredi bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Zdravje"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr ""
@@ -24019,18 +24816,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr ""
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr ""
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr ""
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Lekarna"
@@ -24038,5 +24835,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Uredi lekarno"
@@ -24044,9 +24841,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Bolnišnica"
@@ -24054,10 +24851,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Uredi bolnišnico"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr ""
@@ -24066,5 +24863,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -24073,20 +24870,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -24094,5 +24891,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr ""
@@ -24101,64 +24898,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr ""
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Kraji"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Uredi kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "Država"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Uredi državo"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr ""
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr ""
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr ""
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr ""
@@ -24166,15 +24963,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr ""
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr ""
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr ""
@@ -24182,10 +24979,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr ""
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr ""
@@ -24193,25 +24990,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Vas"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Uredi vas"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "Zaselek"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "Uredi zaselek"
@@ -24219,5 +25016,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr ""
@@ -24225,10 +25022,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "Otok"
@@ -24236,10 +25033,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Uredi otok"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr ""
@@ -24247,5 +25044,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr ""
@@ -24253,5 +25050,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr ""
@@ -24259,10 +25056,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr ""
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Vrh"
@@ -24270,10 +25067,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Uredi vrh"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr ""
@@ -24281,10 +25078,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr ""
@@ -24292,70 +25089,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr ""
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Meje"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr ""
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr ""
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr ""
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr ""
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr ""
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr ""
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Raba tal"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Drevo"
@@ -24364,15 +25161,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Uredi drevo"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr ""
@@ -24381,5 +25178,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr ""
@@ -24387,17 +25184,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "Gozd"
@@ -24406,14 +25203,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "Uredi gozdnata tla"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "Naravni rezervat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "Uredi naravni rezervat"
@@ -24421,25 +25218,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr ""
@@ -24447,10 +25244,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr ""
@@ -24458,5 +25255,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr ""
@@ -24464,5 +25261,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr ""
@@ -24471,45 +25268,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "Vinograd"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "Uredi vinograd"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -24517,25 +25314,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr ""
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr ""
@@ -24543,10 +25340,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr ""
@@ -24554,20 +25351,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr ""
@@ -24575,5 +25372,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -24581,15 +25378,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr ""
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "Pokopališče"
@@ -24597,9 +25394,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Uredi pokopališče"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr ""
@@ -24607,39 +25404,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr ""
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr "Ozemlje železnice"
@@ -24647,15 +25444,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr "Uredi ozemlje železnice"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr ""
@@ -24663,50 +25460,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "Gradbišče"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "Kamnolom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "Uredi kamnolom"
@@ -24716,5 +25513,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr ""
@@ -24723,10 +25520,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr ""
@@ -24734,5 +25531,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr ""
@@ -24741,5 +25538,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -24747,34 +25544,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr ""
@@ -24783,15 +25580,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr ""
@@ -24799,5 +25596,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr ""
@@ -24806,5 +25603,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr ""
@@ -24812,5 +25609,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr ""
@@ -24901,5 +25698,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -24909,17 +25706,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr ""
@@ -24979,5 +25776,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -24986,9 +25783,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr ""
@@ -25002,10 +25799,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr ""
@@ -25013,31 +25810,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr ""
@@ -25046,106 +25843,31 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 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 ""
 
@@ -25681,77 +26403,4 @@
 #: build/trans_style.java:975 build/trans_style.java:983
 msgid "highway_track"
-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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
 msgstr ""
 
@@ -26140,7 +26789,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "Mreža"
+msgstr ""
 
 #. color manmade
@@ -29279,12 +29927,105 @@
 msgstr ""
 
-#~ msgid "Cycleway"
-#~ msgstr "Kolesarska steza"
-
-#~ msgid "Footway"
-#~ msgstr "Pešpot"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parameter ''{0}'' ne sme biti ničen"
+#~ msgid "Move"
+#~ msgstr "Premakni"
+
+#~ msgid "Data Layer"
+#~ msgstr "Podatkovna plast"
+
+#~ msgid "No data imported."
+#~ msgstr "Nič podatkov ni bilo uvoženih."
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Najprej izberite zaznamek."
+
+#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
+#~ msgstr "Ni mogoče razbrati časa \"{0}\" točke {1} x {2}"
+
+#~ msgid "No time for point {0} x {1}"
+#~ msgstr "Točka {0} x {1} nima časovne oznake"
+
+#~ msgid "Image"
+#~ msgstr "Slika"
+
+#~ msgid "Sync clock"
+#~ msgstr "Uskladi uro"
+
+#~ msgid "The date in file \"{0}\" could not be parsed."
+#~ msgstr "Datuma v datoteki \"{0}\" ni bilo možno razbrati."
+
+#~ msgid "There is no EXIF time within the file \"{0}\"."
+#~ msgstr "V datoteki \"{0}\" manjka EXIF čas."
+
+#~ msgid "Cannot open preferences directory: {0}"
+#~ msgstr "Ni možno odpreti imenika z nastavitvami: {0}"
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Neshranjene spremembe"
+
+#~ msgid "their version:"
+#~ msgstr "njihova različica:"
+
+#~ msgid "my version:"
+#~ msgstr "moja različica:"
+
+#~ msgid "Object"
+#~ msgstr "Predmet"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} objektov s konflikti:"
+#~ msgstr[1] "{0} objekt s konfliktom:"
+#~ msgstr[2] "{0} objekta s konflikti:"
+#~ msgstr[3] "{0} objekti s konflikti:"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Uporabniško ime (email) vašega računa pri OSM."
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "Geslo vašega računa pri OSM. Pustite prazno da se geslo ne shranjuje."
+
+#~ msgid "Enter Password"
+#~ msgstr "Vnesite geslo"
+
+#~ msgid "position"
+#~ msgstr "položaj"
+
+#~ msgid "different"
+#~ msgstr "različno"
+
+#~ msgid "false"
+#~ msgstr "napačno"
+
+#~ msgid "true"
+#~ msgstr "pravilno"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr "Dokument ni odprt, zato ni kaj shraniti."
+
+#~ msgid "Email"
+#~ msgstr "E-pošta"
+
+#~ msgid "Load Selection"
+#~ msgstr "Naloži izbrano"
+
+#~ msgid "Contact {0}..."
+#~ msgstr "Kontaktiraj {0}..."
+
+#~ msgid "Merging conflicts."
+#~ msgstr "Spori pri zlivanju"
+
+#~ msgid "No images with readable timestamps found."
+#~ msgstr "Ni moč najti slik z berljivo časovno oznako."
+
+#~ msgid "GPS start: {0}"
+#~ msgstr "Začetek GPS sledi: {0}"
+
+#~ msgid "current delta: {0}s"
+#~ msgstr "trenutna razlika: {0}s"
+
+#~ msgid "GPS end: {0}"
+#~ msgstr "Konec GPS sledi: {0}"
 
 #~ msgid "image"
@@ -29295,106 +30036,4 @@
 #~ msgstr[3] "slike"
 
-#~ msgid "Move"
-#~ msgstr "Premakni"
-
-#~ msgid "Data Layer"
-#~ msgstr "Podatkovna plast"
-
-#~ msgid "No data imported."
-#~ msgstr "Nič podatkov ni bilo uvoženih."
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Najprej izberite zaznamek."
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Ni mogoče razbrati časa \"{0}\" točke {1} x {2}"
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Točka {0} x {1} nima časovne oznake"
-
-#~ msgid "Image"
-#~ msgstr "Slika"
-
-#~ msgid "Sync clock"
-#~ msgstr "Uskladi uro"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "Datuma v datoteki \"{0}\" ni bilo možno razbrati."
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "V datoteki \"{0}\" manjka EXIF čas."
-
-#~ msgid "Cannot open preferences directory: {0}"
-#~ msgstr "Ni možno odpreti imenika z nastavitvami: {0}"
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Neshranjene spremembe"
-
-#~ msgid "their version:"
-#~ msgstr "njihova različica:"
-
-#~ msgid "my version:"
-#~ msgstr "moja različica:"
-
-#~ msgid "Object"
-#~ msgstr "Predmet"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} objektov s konflikti:"
-#~ msgstr[1] "{0} objekt s konfliktom:"
-#~ msgstr[2] "{0} objekta s konflikti:"
-#~ msgstr[3] "{0} objekti s konflikti:"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Uporabniško ime (email) vašega računa pri OSM."
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr ""
-#~ "Geslo vašega računa pri OSM. Pustite prazno da se geslo ne shranjuje."
-
-#~ msgid "Enter Password"
-#~ msgstr "Vnesite geslo"
-
-#~ msgid "position"
-#~ msgstr "položaj"
-
-#~ msgid "different"
-#~ msgstr "različno"
-
-#~ msgid "false"
-#~ msgstr "napačno"
-
-#~ msgid "true"
-#~ msgstr "pravilno"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr "Dokument ni odprt, zato ni kaj shraniti."
-
-#~ msgid "Email"
-#~ msgstr "E-pošta"
-
-#~ msgid "Load Selection"
-#~ msgstr "Naloži izbrano"
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Kontaktiraj {0}..."
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Spori pri zlivanju"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Ni moč najti slik z berljivo časovno oznako."
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "Začetek GPS sledi: {0}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "trenutna razlika: {0}s"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "Konec GPS sledi: {0}"
-
 #~ msgid "timezone difference: "
 #~ msgstr "razlika časovnih pasov: "
@@ -29402,7 +30041,4 @@
 #~ msgid "{0} within the track."
 #~ msgstr "{0} znotraj sledi."
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Vpisanega časa ni bilo mogoče razpoznati."
 
 #~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
@@ -29478,15 +30114,15 @@
 #~ msgstr "Uredi postajo"
 
-#~ msgid "Station"
-#~ msgstr "Postaja"
-
 #~ msgid "zoom"
 #~ msgstr "povečava"
 
-#~ msgid "help"
-#~ msgstr "pomoč"
-
 #~ msgid "Help / About"
 #~ msgstr "Pomoč / O programu"
+
+#~ msgid "Cycleway"
+#~ msgstr "Kolesarska steza"
+
+#~ msgid "Footway"
+#~ msgstr "Pešpot"
 
 #~ msgid "AgPifoJ - Geotagged pictures"
@@ -29587,7 +30223,4 @@
 #~ msgstr "Izbrana možnost javno objavi sled na openstreetmap.org"
 
-#~ msgid "Public"
-#~ msgstr "Javna"
-
 #~ msgid "Update Data"
 #~ msgstr "Posodobitev podatkov"
@@ -29674,4 +30307,7 @@
 #~ msgstr "parameter '{0}' ne sme biti ničen"
 
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "parameter ''{0}'' ne sme biti ničen"
+
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Ni bilo možno prebrati \"{0}\""
Index: applications/editors/josm/i18n/po/sv.po
===================================================================
--- applications/editors/josm/i18n/po/sv.po	(revision 19689)
+++ applications/editors/josm/i18n/po/sv.po	(revision 19698)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 23:20-0500\n"
-"PO-Revision-Date: 2010-01-18 13:37-0500\n"
-"Last-Translator: Andreas Vilén <andreas.vilen@gmail.com>\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-30 13:16+0000\n"
+"Last-Translator: Konrad Skeri <konrad@skeri.com>\n"
 "Language-Team: Swedish <sv@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-01-13 18:27+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:33+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -70,11 +70,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -241,5 +241,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -253,13 +253,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -268,5 +268,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -292,5 +295,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Sammanfoga"
@@ -321,5 +324,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -386,9 +389,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -396,5 +399,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "OK"
@@ -445,6 +450,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -462,5 +467,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -469,11 +474,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -510,5 +515,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "konflikt"
@@ -643,14 +648,14 @@
 msgstr "Välj åtminstone två sträckor att slå ihop"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Kopiera"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Kopiera valda objekt till inklistringsbuffern."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Välj någonting att kopiera."
@@ -683,8 +688,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -693,5 +698,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -749,16 +754,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "{0} konflikter uppstod under import."
-msgstr[1] "{0} konflikter uppstod under import."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "Konflikter under nerladdningen"
-msgstr[1] "Konflikter under nerladdningen"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -779,4 +783,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -786,4 +792,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Duplicera det valda genom att kopiera och omedelbart klistra in."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Dubblera sträcka"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "Flytta vald medlem/valda medlemmar uppåt"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "Lager: {0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "Zooma till {0}"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr ""
 
 #. <button label="Info" hotkey="I">
@@ -874,20 +908,19 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 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] "Den valda sträckan innehåller inte den valda noden."
-msgstr[1] "Den valda sträckan innehåller inte alla de valda noderna."
+msgstr[0] "Den valda sträckan har noder utanför det nedladdade dataområdet."
+msgstr[1] "De valda sträckorna har noder utanför det nedladdade dataområdet."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:68
 msgid "This can lead to nodes being deleted accidentally."
-msgstr ""
+msgstr "Detta kan leda till att noder raderas av misstag."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:156
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:69
 msgid "Are you really sure to continue?"
-msgstr ""
+msgstr "Är du verkligen säker på att du vill fortsätta?"
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157
@@ -898,5 +931,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:171
 msgid "No intersection found. Nothing was changed."
-msgstr ""
+msgstr "Inget överlapp funnet. Ingenting har ändrats."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:193
@@ -998,5 +1031,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "URL"
@@ -1046,5 +1079,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:129
 msgid "Click to abort merging nodes"
-msgstr ""
+msgstr "Klicka för att avbryta nodsammanslagning"
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:136
@@ -1148,5 +1181,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+#, fuzzy
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr "<html>Kan inte öppna mapp.<br>Välj en fil!"
 
@@ -1160,8 +1194,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Öppnar {0} filer..."
+msgstr[0] "Öppnar {0} fil..."
 msgstr[1] "Öppnar {0} filer..."
 
@@ -1218,7 +1252,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1232,5 +1266,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "Flytta noder så att alla vinklar är 90 eller 270 grader"
 
@@ -1270,4 +1305,8 @@
 "resultat vid rektangulära alignments.<br>Ändra projektionen för att få bort "
 "denna varning.<br>Vill du fortsätta?</html>"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+msgid "Selection must consist only of ways and nodes."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:186
@@ -1283,4 +1322,15 @@
 msgid "Selected Elements cannot be orthogonalized"
 msgstr "Valda element kan ej rätas ut"
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr "Välj sträckor som nästan har räta vinklar att räta upp."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1297,9 +1347,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:151
 msgid "Delete incomplete members?"
-msgstr ""
+msgstr "Radera inkompletta medlemmar?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:152
 msgid "Paste without incomplete members"
-msgstr ""
+msgstr "Klistra in utan inkompletta medlemmar"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
@@ -1309,4 +1359,7 @@
 "incomplete primitives?"
 msgstr ""
+"Det kopierade datat innehåller inkompletta primitiv. Vid inklistring kommer "
+"inkompletta primitiv att plockas bort. Vill du klistra in data utan de "
+"inkompletta primitiven?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
@@ -1341,5 +1394,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:25
 msgid "Open a preferences dialog for global settings."
-msgstr ""
+msgstr "Öppna en inställningsdialogruta för globala inställningar."
 
 #: ../core/src/org/openstreetmap/josm/actions/PreferencesAction.java:26
@@ -1388,18 +1441,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1424,12 +1477,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Fel"
@@ -1564,5 +1618,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1774,9 +1828,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "Duplicera {0} noder till {1} noder"
-msgstr[1] "Duplicera {0} noder till {1} noder"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1820,5 +1874,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr "Hämta data"
@@ -1827,10 +1881,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:27
 msgid "Update modified"
-msgstr ""
+msgstr "Uppdatering modifierad"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:25
 msgid ""
 "Updates the currently modified objects from the server (re-downloads data)"
-msgstr ""
+msgstr "Uppdaterar modifierade objekt från servern (hämtar data på nytt)"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74
@@ -1899,14 +1953,14 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:258
 msgid "Checking parents for deleted objects"
-msgstr ""
+msgstr "Kontrollerar föräldrar för raderade objekt"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:317
 #, java-format
 msgid "Reading parents of ''{0}''"
-msgstr ""
+msgstr "Läser föräldrar till \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:323
 msgid "Checking for deleted parents in the local dataset"
-msgstr ""
+msgstr "Söker efter raderade föräldrar i det lokaka datasetet"
 
 #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:23
@@ -1917,5 +1971,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:25
 msgid "Enable/disable rendering the map as wireframe only"
-msgstr ""
+msgstr "Aktivera/avaktivera rendering som enbart wireframe"
 
 #: ../core/src/org/openstreetmap/josm/actions/WireframeToggleAction.java:26
@@ -2218,5 +2272,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
 msgid "Move a segment along its normal, then release the mouse button."
-msgstr ""
+msgstr "Flytta ett segment längs dess normal och släpp sedan musknappen."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
@@ -2229,4 +2283,6 @@
 "its normal."
 msgstr ""
+"Dra ett vägsegment för att skapa en rektangel. Ctrl+dra för att flytta ett "
+"segment längs dess normal."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:29
@@ -2245,6 +2301,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2327,7 +2383,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
-#, fuzzy
 msgid "<not>"
-msgstr "norr"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
@@ -2369,5 +2424,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Sök efter objekt."
@@ -2377,5 +2432,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79
 msgid "Please enter a filter string."
-msgstr ""
+msgstr "Ange filtersträng"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:79
@@ -2385,5 +2440,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:84
 msgid "Enter the search expression"
-msgstr ""
+msgstr "Ange sökuttryck"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:92
@@ -2401,5 +2456,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:95
 msgid "find in selection"
-msgstr ""
+msgstr "sök i markering"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:102
@@ -2429,5 +2484,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:121
 msgid "<b>type=route</b> - key ''type'' with value exactly ''route''."
-msgstr ""
+msgstr "<b>type=route</b> - nyckel \"type\" med det exakta värdet \"route\"."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:122
@@ -2436,4 +2491,6 @@
 "<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 msgstr ""
+"<b>type=*</b> - nyckel \"type\" oavsett värde. Försök även <b>*=värde</b>, "
+"<b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:123
@@ -2443,5 +2500,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:124
 msgid "<b>oneway?</b> - oneway=yes, true, 1 or on"
-msgstr ""
+msgstr "<b>oneway?</b> - oneway=yes, true, 1 eller on"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:125
@@ -2466,9 +2523,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:129
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
-msgstr ""
+msgstr "<b>user:anonymous</b> - alla objekt ändrade av anonyma användare"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:130
 msgid "<b>id:</b>... - object with given ID (0 for new objects)"
-msgstr ""
+msgstr "<b>id:</b>... - objekt med angivet ID (0 för alla nya objekt)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:131
@@ -2477,4 +2534,6 @@
 "assigned version)"
 msgstr ""
+"<b>version:</b>... - objekt med angiven version (0 för objekt utan en "
+"angiven version)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:132
@@ -2483,4 +2542,6 @@
 "assigned changeset)"
 msgstr ""
+"<b>changeset:</b>... - objekt med angivet ändringssets-id (0 för objekt utan "
+"angivet ändringsset)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:133
@@ -2489,4 +2550,6 @@
 "min-max)"
 msgstr ""
+"<b>nodes:</b>... - objekt med angivet antal noder (nodes:antal eller nodes:"
+"min-max)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:134
@@ -2495,4 +2558,6 @@
 "max)"
 msgstr ""
+"<b>tags:</b>... - objekt med angivet antal taggar (tags:antal eller tags:min-"
+"max)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:135
@@ -2501,4 +2566,6 @@
 "12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
 msgstr ""
+"<b>timestamp:</b>... - objekt med angiven tidsstämpel (<b>2006-11-"
+"12T14:51:09Z</b>, <b>2006-11-12</b> eller <b>T14:51</b> ...)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136
@@ -2522,4 +2589,5 @@
 "<b>child <i>expr</i></b> - all children of objects matching the expression"
 msgstr ""
+"<b>child <i>uttryck</i></b> - alla barn till objekt matchande uttrycket"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:141
@@ -2527,4 +2595,5 @@
 "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
 msgstr ""
+"<b>parent <i>uttryck</i></b> - alla föräldrar till objekt matchande uttrycket"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:142
@@ -2541,4 +2610,6 @@
 "escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
 msgstr ""
+"I citerade strängar behöver <b>\"</b> och <b>\\</b> föregås av ett <b>\\</"
+"b>. (Dvs. <b>\\\"</b> och <b>\\\\</b>)."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:145
@@ -2555,5 +2626,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Sök"
@@ -2585,5 +2656,5 @@
 #, java-format
 msgid "Nothing found in selection by searching for ''{0}''"
-msgstr ""
+msgstr "Inget funnet i markeringen vid sökande efter \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:295
@@ -2593,12 +2664,11 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "S"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
@@ -2606,11 +2676,10 @@
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
-msgstr "RX"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2624,17 +2693,17 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
-msgstr ""
+msgstr "Mönstersyntaxfel: Mönster {0} i {1} är inte giltigt!"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:440
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
-msgstr ""
+msgstr "Okänd primitivtyp: {0}. Tillåtna värden är nod, sträcka eller relation"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:623
@@ -2722,5 +2791,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java:35
 msgid "Cyclic dependency between relations:"
-msgstr ""
+msgstr "Cykliskt beroende mellan relationer:"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
@@ -2731,12 +2800,15 @@
 "dependency.</html>"
 msgstr ""
+"<html>{0} relationer skapar en cykel då de refererar till varandra.<br>JOSM "
+"kan inte ladda upp dem. Ändra relationerna för att bryta det cykliska "
+"beroendet.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
 msgid "Relation ..."
-msgstr ""
+msgstr "Relation ..."
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:54
 msgid "... refers to relation"
-msgstr ""
+msgstr "... refererar till relation"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:87
@@ -2747,82 +2819,82 @@
 #, java-format
 msgid "Add node {0}"
-msgstr ""
+msgstr "Lägg till nod {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
 #, java-format
 msgid "Add way {0}"
-msgstr ""
+msgstr "Lägg til sträcka {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/AddCommand.java:68
 #, java-format
 msgid "Add relation {0}"
-msgstr ""
+msgstr "Lägg till relation {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "Ändra {0} objekt"
-msgstr[1] "Ändra {0} objekt"
+msgstr[0] "Lade till {0} objekt"
+msgstr[1] "Lade till {0} objekt"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
 #, java-format
 msgid "Change node {0}"
-msgstr ""
+msgstr "Ändra nod {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:50
 #, java-format
 msgid "Change way {0}"
-msgstr ""
+msgstr "Ändra sträcka {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:51
 #, java-format
 msgid "Change relation {0}"
-msgstr ""
+msgstr "Ändra relation {0}"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:102
 #, java-format
 msgid "Remove \"{0}\" for node ''{1}''"
-msgstr ""
+msgstr "Radera \"{0}\" för nod \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:103
 #, java-format
 msgid "Remove \"{0}\" for way ''{1}''"
-msgstr ""
+msgstr "Radera \"{0}\" för sträcka \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:104
 #, java-format
 msgid "Remove \"{0}\" for relation ''{1}''"
-msgstr ""
+msgstr "Radera \"{0}\" för relation \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:109
 #, java-format
 msgid "Set {0}={1} for node ''{2}''"
-msgstr ""
+msgstr "Sätt {0}={1} för nod \"{2}\""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:110
 #, java-format
 msgid "Set {0}={1} for way ''{2}''"
-msgstr ""
+msgstr "Sätt {0}={1} för sträcka \"{2}\""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:111
 #, java-format
 msgid "Set {0}={1} for relation ''{2}''"
-msgstr ""
+msgstr "Sätt {0}={1} för relation\"{2}\""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "Ta bort \"{0}\" för {1} {2}"
+msgstr "Radera \"{0}\" från {1} objekt"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Sätt {0}={1} för {2} {3}"
+msgstr "Sätt {0}={1} för {2} objekt"
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
 #, java-format
 msgid "Change relation member role for {0} {1}"
-msgstr ""
+msgstr "Ändra relationsmedlemsroll för {0} {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32
@@ -2836,5 +2908,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1112
 msgid "Double conflict"
-msgstr ""
+msgstr "Dubbel konflikt"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54
@@ -2877,17 +2949,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Borttagningsläge"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Ta bort lager"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "Ta bort från relation"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2968,9 +3040,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "Ändra {0} objekt"
-msgstr[1] "Ändra {0} objekt"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -3018,14 +3090,14 @@
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "Undelete {0} primitive"
 msgid_plural "Undelete {0} primitives"
-msgstr[0] "Ångra radering av {0} primitiv"
-msgstr[1] "Ångra radering av {0} primitiv"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for node {0}"
-msgstr "Jämka {0} konflikter i {1} objekt"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
@@ -3035,7 +3107,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Verkligen ta bort det valda från relation {0}?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3282,5 +3354,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3288,5 +3360,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3294,5 +3366,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3300,5 +3372,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3377,8 +3449,7 @@
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "WC"
+msgstr ""
 
 #. column header: inverted filter
@@ -3397,8 +3468,7 @@
 #. filter mode: replace
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210
-#, fuzzy
 msgctxt "filter"
 msgid "R"
-msgstr "RX"
+msgstr ""
 
 #. filter mode: add
@@ -3420,19 +3490,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3441,5 +3511,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3447,5 +3517,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3568,6 +3638,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3577,5 +3647,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3586,7 +3656,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3608,5 +3678,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "bakgrund"
@@ -3750,6 +3820,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3757,37 +3827,38 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "ofullständig"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "landsväg"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "järnväg"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "vattendrag"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "markanvändning"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3796,10 +3867,10 @@
 msgstr[1] "{0} noder"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3808,5 +3879,5 @@
 msgstr[1] "{0} medlemmar"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3843,6 +3914,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Konflikt"
@@ -3853,7 +3924,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-#, fuzzy
-msgid "Authorization Failed"
-msgstr "Anslutning misslyckades."
+msgid "Authorisation Failed"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
@@ -4056,5 +4126,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Initierar"
@@ -4095,5 +4164,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4104,5 +4173,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Redigera"
@@ -4173,29 +4242,29 @@
 msgstr "skala"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Den geografiska longituden vid muspekaren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The name of the object at the mouse pointer."
 msgstr "Namnet på objektet vid muspekaren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Den geografiska latituden vid muspekaren."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 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:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 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:106
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 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:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4203,9 +4272,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(inget objekt)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4365,9 +4434,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Korrigera taggkonflikter"
-msgstr[1] "Korrigera taggkonflikter"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
@@ -4429,16 +4498,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4634,8 +4703,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr "Slå ihop noder med den äldsta."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4661,5 +4734,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional node used by way {1}<br>which is deleted on the "
@@ -4669,9 +4742,5 @@
 "server.<br><br>Do you want to undelete these nodes too?"
 msgstr[0] ""
-"<html>Det finns {0} ytterligare noder som används av väg {1}<br>, som är "
-"raderade på servern.<br><br>Vill du återskapa dessa noder också?</html>"
 msgstr[1] ""
-"<html>Det finns {0} ytterligare noder som används av väg {1}<br>, som är "
-"raderade på servern.<br><br>Vill du återskapa dessa noder också?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
@@ -4680,5 +4749,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional primitive referred to by relation {1}<br>which is "
@@ -4688,9 +4757,5 @@
 "deleted on the server.<br><br>Do you want to undelete these too?"
 msgstr[0] ""
-"<html>Det finns {0} ytterligare noder som används av väg {1}<br>, som är "
-"raderade på servern.<br><br>Vill du återskapa dessa noder också?</html>"
 msgstr[1] ""
-"<html>Det finns {0} ytterligare noder som används av väg {1}<br>, som är "
-"raderade på servern.<br><br>Vill du återskapa dessa noder också?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
@@ -4791,5 +4856,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr ""
@@ -4835,5 +4900,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -4963,10 +5033,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "inget"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "alla"
@@ -4996,7 +5066,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-#, fuzzy, java-format
+#, java-format
 msgid "Tag collection does not include the selected value ''{0}''."
-msgstr "Den valda sträckan innehåller inte den valda noden."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
@@ -5046,7 +5116,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -5056,6 +5126,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5235,10 +5305,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5258,19 +5328,19 @@
 msgstr "Kommandolista: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Jämka"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr ""
 "Öppna en sammanfogningsdialog med alla de valda posterna från listan ovan."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5302,8 +5372,9 @@
 msgid ""
 "<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions won't be applied unless all differences<br>are "
-"resolved.Click <strong>{0}</strong> to close anyway."
-"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<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 ""
 
@@ -5326,5 +5397,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5333,5 +5404,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5411,43 +5482,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Lager"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 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:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Visa/Dölj"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Dubblera sträcka"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 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:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Flytta det valda lagret en rad ner."
@@ -5461,6 +5537,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "Relationer"
@@ -5470,69 +5546,69 @@
 msgstr "Öppna en lista över alla relationer"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "Relationer: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Öppna en redigerare för den valda relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Ta bort den valda relationen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Skapa en ny relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Aktuellt urval"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Öppna en urvalslista"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Zooma till valda objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Zooma till urval"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Urval: Rel.:{0}/Sträckor:{1}/Noder:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5540,5 +5616,5 @@
 msgstr "Markering"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5891,8 +5967,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -5964,4 +6038,7 @@
 #. <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 />
@@ -6040,6 +6117,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6081,6 +6159,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6549,152 +6629,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "Namn"
@@ -7077,5 +7159,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<olika>"
@@ -7130,55 +7212,55 @@
 msgstr "Lägg till egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Egenskaper: {0} / Medlemskap: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Egenskaper / Roller"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "Ändra relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "Ta bort från relation"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Verkligen ta bort det valda från relation {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Ta bort den valda nyckeln från alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "Ta bort egenskaper"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Lägg till ett nytt nyckel/värde-par till alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Redigera värdet av den valda nyckeln för alla objekt."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7505,7 +7587,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
-#, fuzzy
 msgid "Do you really want to apply the new role?"
-msgstr "Vill du tillåta detta?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
@@ -7600,8 +7681,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr "Ignorerar undantag eftersom hämtningen avbrutits. Undantaget var: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
@@ -7621,47 +7702,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Bokmärken"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../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:187
+#: ../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:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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:212
+#: ../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:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr ""
@@ -7785,18 +7865,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -7807,34 +7887,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
 msgid "Enter a place name to search for:"
 msgstr "Ange ett platsnamn att söka efter:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+#: ../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:147
+#: ../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:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr ""
@@ -7845,7 +7925,9 @@
 #. 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" />
@@ -7854,10 +7936,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Typ"
@@ -7866,5 +7949,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -7876,17 +7959,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "okänd"
@@ -8231,5 +8313,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr ""
@@ -8675,9 +8757,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8687,7 +8769,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -8699,16 +8781,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "Lager"
@@ -9121,68 +9203,68 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "gps-punkt"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Anpassa linjeritning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../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:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Anpassa färger"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Standard"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../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:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr "Markörer från namngivna punkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "Namngivna spårpunkter från {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Importera ljud"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9192,23 +9274,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave-ljudfiler (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "Ljudmarkörer från {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Importera bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9218,5 +9300,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9224,5 +9306,5 @@
 msgstr "Namn: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9230,5 +9312,5 @@
 msgstr "Beskrivning: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9238,23 +9320,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "Beskrivning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Längd: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9263,5 +9345,5 @@
 msgstr[1] "{0} rutter, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9270,10 +9352,10 @@
 msgstr[1] "{0} sträckpunkter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Omvandla till datalager"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9283,43 +9365,43 @@
 "skicka in spår, se här:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Omvandlad från:{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "Hämta från OSM längs med detta spår"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Hämta allting inom:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} meter"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "Största tillåtna område per begäran:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9330,9 +9412,9 @@
 "Önskar du<br>fortsätta?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 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:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9342,5 +9424,5 @@
 "än dess slut uteslöts eller flyttades till början."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9350,23 +9432,23 @@
 "kunna uppskattas med någon rimlighet uteslöts."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "Datalager {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "utanför hämtat område"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9375,5 +9457,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9387,5 +9469,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9398,11 +9480,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9411,32 +9493,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} består av:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "Omvandla till gpx-lager"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9483,28 +9565,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "GPS-punkter"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX-filer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, 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:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "Fel vid tolkning {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Kunde inte öppna \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9516,34 +9597,34 @@
 "välj en tidzon<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr "Fototid (från exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 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:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr "Jag är i följande tidzon: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "Inget datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr "Öppna ett annat foto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 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:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9553,64 +9634,64 @@
 "Använd begärt format"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "Ogiltigt datum"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 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:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr "GPX-spår: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr "Öppna ett annat foto"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr "Tidszon: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr "Förskjutning:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9620,45 +9701,45 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 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:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr "Korrelera"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr "Ogiltig tidszon"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr "Ogiltig förskjutning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr "Tidszon: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr "Minuter: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr "Sekunder: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9667,5 +9748,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9673,21 +9754,21 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr "Matchning av fotografier mot spår misslyckades"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr "Justera tidszon och tidsförskjutning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 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:951
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr "Fotografierna innehåller ingen tidsinformation."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -9696,17 +9777,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:980
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr "GPX-spåret saknar tidsinformation"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr "Välj ett GPX-spår"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr "Inget GPX-spår har valts"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9717,5 +9798,5 @@
 "Förväntat format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9726,75 +9807,75 @@
 "Förväntat format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "Extraherar GPS-plats från EXIF"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr "Påbörjar foldergenomläsning"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "Läs in foton..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "Läser {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, java-format
 msgid "Unable to get canonical path for directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Läser igenom folder {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, 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:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Geotaggade bilder"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr "Korrelerar med GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "Ingen data har lästs in."
-msgstr[1] "Ingen data har lästs in."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
+#, java-format
 msgid "{0} was found to be GPS tagged."
 msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] "{0} hittades med gps-taggar."
-msgstr[1] "{0} hittades med gps-taggar."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -9803,5 +9884,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -9898,5 +9979,5 @@
 msgstr "gps-markör"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:176
 msgid "marker"
 msgid_plural "markers"
@@ -9904,5 +9985,5 @@
 msgstr[1] "markörer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -9911,29 +9992,29 @@
 msgstr[1] "{0} består av {1} markörer"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "Synkronisera ljud"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 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:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr "Ljud synkroniserat vid punkt {0}."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr "Skapa ljudmarkör vid spelhuvud"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -9943,17 +10024,17 @@
 "markören."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 msgid "No existing audio markers in this layer to offset from."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Visa/Dölj text/ikoner"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 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:171
+#: ../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 "
@@ -9961,5 +10042,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -9969,5 +10050,5 @@
 "spårpunkt där du vill synkronisera."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "Kunde inte skapa ny ljudmarkör."
@@ -9993,5 +10074,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
 #, java-format
 msgid ""
@@ -9999,5 +10080,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
 #, java-format
 msgid ""
@@ -10049,8 +10130,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize URL:"
-msgstr "Upphovsman"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10140,8 +10219,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize now"
-msgstr "Upphovsman"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10200,7 +10277,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
-#, fuzzy
 msgid "OAuth authorization failed"
-msgstr "Anslutning misslyckades."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
@@ -10280,8 +10356,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
-#| msgid "Please select at least four nodes."
 msgid "Please select an authorization procedure: "
-msgstr "Välj åtminstone fyra noder."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10291,8 +10365,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
-#, fuzzy
-#| msgid "Close dialog and cancel downloading"
 msgid "Close the dialog and cancel authorization"
-msgstr "Stäng dialogen och avbryt hämtning"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
@@ -10606,5 +10678,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Välj vilken rad du vill ändra."
@@ -10618,5 +10690,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10766,9 +10838,4 @@
 msgstr "Ritstil{0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "Lager: {0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -10798,6 +10865,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr "Alla"
@@ -10836,8 +10903,8 @@
 msgstr "En enda färg (kan anpassas för namngivna lager)"
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Bil"
@@ -10859,13 +10926,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Cykel"
@@ -10898,12 +10965,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "Fotgängare"
@@ -11257,5 +11324,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
-#, fuzzy
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11271,17 +11337,4 @@
 "keyboard...</p>"
 msgstr ""
-"<p>Du kommer att märka att urvalslistan för tangenter på nästa sida "
-"innehåller alla tangenter som finns på alla typer av tangentbord som Java "
-"känner till, inte enbart de som finns på det tangentbord du använder. Använd "
-"enbart de värden som motsvarar tangenter som motsvarar en faktisk tangent på "
-"ditt tangentbord. Så om det inte finns någon 'Copy'-tangent på ditt "
-"tangentbord (pc-tangentbord saknar dem, sun-tangentbord har dem) så använd "
-"den inte. Det kommer också att finnas 'tangenter' som motsvarar ett "
-"kortkommando på ditt tangentbord (t ex ':' /kolon). Använd inte dem heller, "
-"använd den omodifierade tangenten (';'/semikolon på ett amerikanskt "
-"tangentbord, '.'/punkt på tyska eller svenska tangentbor,...) istället. Om "
-"du inte gör så kan krockar uppstå, eftersom det inte finns något sätt för "
-"JOSM att veta att på ett amerikanskt tangentbord så är i själva verket Ctrl"
-"+Shift+; och Ctrl+: samma sak...</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
@@ -11903,5 +11956,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -11909,18 +11969,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "Valfria attribut:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr "slutenväg"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "Okänd typ: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -11931,16 +11991,16 @@
 msgstr "Kunde inte läsa källan till snabbval för taggning: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "Fel vid tolkning {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, 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:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -11949,18 +12009,17 @@
 msgstr[1] "Ändra {0} objekt"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "Inget markerat!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "Urvalet passar inte!"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "Tillämpa snabbval"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Ändra egenskaper"
@@ -12236,6 +12295,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12260,9 +12319,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Tolkningsfel: ogiltig dokumentstruktur för gpx-dokument"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12278,7 +12337,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
-#, fuzzy
 msgid "Looking for image files"
-msgstr "Letar efter strandlinje..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
@@ -12286,7 +12344,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
@@ -12358,5 +12422,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "Koordinater importerade: "
@@ -12457,9 +12521,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Ändra {0} objekt"
-msgstr[1] "Ändra {0} objekt"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -13086,5 +13150,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -13093,9 +13157,5 @@
 "are:"
 msgstr[0] ""
-"Insticksmodul {0} behövs för att insticksmodul {1} ska fungera, men kunde "
-"inte hittas."
 msgstr[1] ""
-"Insticksmodul {0} behövs för att insticksmodul {1} ska fungera, men kunde "
-"inte hittas."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13364,5 +13424,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13370,8 +13429,4 @@
 "file a bug report."
 msgstr ""
-"Ett oväntat undantag inträffade.\n"
-"\n"
-"Detta beror alltid på fel i koden. Om du använder senaste\n"
-"lämna in en felrapport."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13466,6 +13521,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -13582,6 +13637,6 @@
 "Kunde inte hitta någon översättning för locale {0}. Faller tillbaka på {1}."
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13590,5 +13645,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -13737,4 +13792,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr ""
@@ -13825,5 +13881,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "Adressinterpolation"
@@ -14408,5 +14464,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr "Plats"
@@ -14565,21 +14621,21 @@
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr ""
@@ -14611,9 +14667,9 @@
 msgstr "Skapa en dubblett av sträcka"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 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:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr "Konvertera till GPX-lager med anonymiserad tid"
@@ -14628,13 +14684,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr "Importera sträckning från GPX-lager"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr "Glöm existerande sträckning"
@@ -14643,6 +14699,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr "Inget GPX-datalager kunde hittas."
@@ -14871,17 +14927,17 @@
 msgstr "Hämta en uppsättning bilder som ett nytt lager."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr "Riktningsindex '{0}' kunde inte hittas"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr "Startpositionen låg inte inom gränsvärdena (bbox)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:105
 msgid "Looking for shoreline..."
 msgstr "Letar efter strandlinje..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -14925,42 +14981,41 @@
 msgstr "Tar bort dubblettnoder..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr "Spår från lakewalker"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "öster"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "nordöst"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "norr"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "nordväst"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "väster"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "sydväst"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "söder"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "sydöst"
@@ -15016,6 +15071,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -15024,74 +15079,74 @@
 msgstr "vatten"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "kustlinje"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "land"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Maximum number of segments per way"
 msgstr "Största tillåtna antal delsträckor per sträcka"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
 msgid "Maximum number of nodes in initial trace"
 msgstr "Största tillåtna antal noder i grundspåret"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Maximalt gråskalevärde att räkna som vatten (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
 msgid "Line simplification accuracy (degrees)"
 msgstr "Noggrannhet vid linjeförenkling (grader)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Upplösning på landsatrutor (pixlar per grad)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Storlek på landsatrutor (pixlar)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
 msgid "Shift all traces to east (degrees)"
 msgstr "Förskjut alla spår österut (grader)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
 msgid "Shift all traces to north (degrees)"
 msgstr "Förskjut alla spår norrut (grader)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
 msgid "Direction to search for land"
 msgstr "Riktning att söka efter land i"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
 msgid "Tag ways as"
 msgstr "Tagga sträckor som"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr "WMS-lager"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr "Största tillåtna cachestorlek (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
 msgid "Maximum cache age (days)"
 msgstr "Största tillåtna cacheålder (dagar)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:68
 msgid "Source text"
 msgstr "Källtext"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr ""
 "Största antal delsträckor som tillåts i varje skapad sträcka. Förval 250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -15101,5 +15156,5 @@
 "av linje). Förval 50000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -15109,5 +15164,5 @@
 "Kan vara mellan 0-255. Förval 90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -15117,26 +15172,26 @@
 "värden ger fler noder och en mer noggrann linje. Förval: 0,0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr "Upplösning på landsatrutor mätt i pixlar per grad. Förval 4000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Storlek på en landsatruta, mätt i pixlar. Förval 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Förskjut alla punkter i östlig riktning (grader). Förval: 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Förskjut alla punkter i nordlig riktning (grader). Förval 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Direction to search for land. Default east."
 msgstr "I vilken riktning som land skall eftersökas. Förval öster."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr ""
@@ -15144,35 +15199,35 @@
 "lämna otaggat (nothing). Förval är vatten."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr ""
 "Vilket WMS-lager skall användas som underlag för spårning. Förval är IR1."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr ""
 "Största tillåtna storlek för varje cache-bibliotek i byte. Förval är 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr "Största tillåtna ålder för varje cachad fil i dagar. Förval är 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr "Text som anger datakälla. Förval är Landsat"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "En insticksmodul för att spåra vattensamlingar på landsat-bilder."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr "Inställningar för insticksmodulen Lakewalker"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:50
 msgid "Downloading image tile..."
 msgstr "Hämtar bildruta..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr "Kunde inte skaffa en bild"
@@ -15196,5 +15251,5 @@
 msgstr "Anslutning misslyckades"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr ""
@@ -15225,5 +15280,5 @@
 msgstr ""
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr "LiveGPS-lager"
@@ -15298,5 +15353,5 @@
 msgstr "Vinkel mellan två valda noder"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr "Lager för att utföra mätningar"
@@ -15561,4 +15616,76 @@
 msgid "Firefox executable"
 msgstr "Firefox-applikationen"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#, fuzzy
+msgid "Read error!"
+msgstr "Resevoar"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Ange den nya nodens koordinater."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Behåll backup-filer"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Fel"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "Angiven tid kunde inte tolkas."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "Kunde inte döpa om filen ''{0}''"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Behåll backup-filer"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "Behåll backup-filer"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Skriv över"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+#, fuzzy
+msgid "Could not delete temporary file!"
+msgstr "Kunde inte hitta elementtyp"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
@@ -15834,6 +15961,6 @@
 msgstr "Spara fångade data till en fil varje minut."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -15960,72 +16087,129 @@
 "Du måste först ange källor för snabbval för taggning i inställningarna."
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+#, fuzzy
+msgid "Terrace a house"
+msgstr "Gör radhus av husrad"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+msgid "Interpolation"
+msgstr "Interpolering"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Vägar"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Högst nummer"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Lägst nummer"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+#, fuzzy
+msgid "Lowest housenumber of the terraced house"
+msgstr "Kastar om husnumrena i en husrad."
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Skapa en ny relation"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Skapa en dubblett av sträcka"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Gatunamn"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr "Lägst nummer"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr "Högst nummer"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr "Vänd på husrad"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr "Kastar om husnumrena i en husrad."
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr "Vänd på husrad"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:83
+msgid "Cannot reverse!"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:125
 msgid "Reverse Terrace"
 msgstr "Vänd husrad"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr "Gör radhus av husrad"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr "Skapar enskilda byggnader från en lång byggnad."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr "Markera en enda, stängd väg med minst fyra noder."
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr "Husrad"
@@ -16261,5 +16445,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr "Dubbletter av noder"
@@ -16270,5 +16454,5 @@
 "Detta test kontrollerar att det inte finns några noder med precis samma läge."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16280,9 +16464,9 @@
 "använder dem.<br> Vill du verkligen ta bort dem?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr ""
@@ -16317,5 +16501,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -16468,7 +16652,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr "Ogiltig kombination av nyckel och värde"
@@ -16476,80 +16660,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr "Ritningsproblem"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Nyckeln ''{0}'' är ogiltig."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr "Taggar med tomma värden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr "Ogiltig egenskapsnyckel"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr "Egenskapsnyckel innehåller ogiltigt blanksteg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr "Egenskapsvärdet börjar eller slutar med blanksteg"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr "Det finns en HTML-markör i egenskapsvärdet"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr "FIXME-taggar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr "Kontrollera egenskapsnycklar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "Validera egenskapsnycklar genom att kontrollera mot en lista av ord."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr "Använd komplicerad egenskapskontroll."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr "Validera egenskapsvärden och taggar med hjälp av komplicerade regler."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr "Källa för TagChecker"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16560,88 +16744,88 @@
 "taggkontrollera datafiler."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr "Lägg till en ny källa till listan."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr "Redigera vald källa."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "Ta bort vald källa från listan."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "Datakällor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr "Kontrollera egenskapsvärden"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr ""
 "Validera att egenskapsvärden är giltiga genom kontroll mot förinställningar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr "Leta efter FIXME-taggar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr ""
 "Letar efter noder och sträckor som har texten FIXME i något egenskapsvärde."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr "Kontrollera om det finns ritningsanmärkningar."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr "Kontrollera om problem uppstod vid ritning av kartan"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr "Använd förvald datafil."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr "Använd den förvalda datafilen (rekommenderas)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr "Använd förvalda rättstavningsfil."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Använd den förvalda rättstavningsfilen (rekommenderas)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr "Rätta till egenskaper"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr "Kunde inte hitta elementtyp"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr "Kunde inte hitta varningsnivå"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Ogiltigt uttryck ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -17089,5 +17273,5 @@
 msgstr "WMS-lager ({0}), hämtas i zoomläge {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -17098,63 +17282,63 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+msgid "Download visible tiles"
+msgstr "Hämta de rutor som syns"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
 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:309
-msgid "Download visible tiles"
-msgstr "Hämta de rutor som syns"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "Ändra upplösning"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr "Läs om felaktiga rutor"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr "Alfakanal"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "Spara WMS-lagret till en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "Hämta WMS-lager från en fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, 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:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr "Fel filformat"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "Fel vid läsning av fil"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -17408,6 +17592,13 @@
 msgstr ""
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17416,15 +17607,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17435,10 +17626,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17447,15 +17638,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17465,10 +17656,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17477,5 +17668,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17484,10 +17675,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -17594,6 +17785,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -17601,6 +17801,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "Referens"
@@ -17617,5 +17818,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Filer"
@@ -17637,10 +17838,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Största tillåtna hastighet (km/h)"
@@ -17684,14 +17885,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "Enkelriktat"
@@ -17734,13 +17935,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -17778,13 +17979,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -17819,13 +18020,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "Skärning"
@@ -17860,13 +18061,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "Bank"
@@ -17998,4 +18199,13 @@
 msgid "Edit Unclassified Road"
 msgstr "Redigera en oklassificerad väg"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr ""
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -18013,15 +18223,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr "Bredd (meter)"
@@ -18033,5 +18243,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Bostadsområde"
@@ -18040,5 +18250,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "Redigera en gata i bostadsområde"
@@ -18056,16 +18266,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Yta"
@@ -18087,166 +18300,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr "belagd"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr "obelagd"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "skog"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr "kullersten"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "grus"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "gräs"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "sand"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr ""
@@ -18254,5 +18474,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr "Gårdsgata"
@@ -18261,5 +18481,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr "Redigera en gårdsgata"
@@ -18267,5 +18487,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "Gågata"
@@ -18274,5 +18494,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "Redigera en gågata"
@@ -18280,5 +18500,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr "Tillfartsväg"
@@ -18287,5 +18507,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr "Redigera en tillfartsväg"
@@ -18295,18 +18515,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr "Type av tillfartsväg"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr "gränd"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr "uppfart"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr ""
@@ -18314,5 +18534,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr ""
@@ -18322,5 +18542,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr ""
@@ -18328,5 +18548,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "Väg (okänd typ)"
@@ -18335,5 +18555,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "Redigera en väg av okänd typ"
@@ -18342,20 +18562,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "Vägbegränsningar"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "Redigera vägbegränsningar"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "Betalstation"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "Återvändsgränd"
@@ -18363,9 +18583,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 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"
@@ -18376,6 +18597,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18387,4 +18606,5 @@
 #. 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"
@@ -18403,141 +18623,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+msgid "yes"
+msgstr "ja"
+
+#. 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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "privat"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+msgstr "avsedd för"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:219
+msgid "destination"
+msgstr "mål"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr "med tillåtelse"
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr "jordbruksfordon"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-msgid "yes"
-msgstr "ja"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "privat"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-msgstr "avsedd för"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "mål"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr "med tillåtelse"
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr "jordbruksfordon"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "nej"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr "Lätt lastbil"
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Tung lastbil"
@@ -18552,10 +18780,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr "Häst"
@@ -18571,10 +18799,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "Motorcykel"
@@ -18589,27 +18817,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr "Bil"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr "Allmänna transportmedel (psv)"
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr "Motorbåt"
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "Båt"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Minsta tillåtna hastighet (km/h)"
@@ -18617,25 +18837,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "Största tillåtna vikt (ton)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr "Största tillåtna höjd (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr "Största tillåtna bredd (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr "Största tillåtna längd (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "Rondell"
@@ -18646,5 +18866,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "Redigera en korsning"
@@ -18664,10 +18884,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "motorväg"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr "motorvägslänk"
@@ -18689,10 +18909,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "stamväg"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr "stamvägslänk"
@@ -18714,10 +18934,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "primärväg"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr "primärvägslänk"
@@ -18739,5 +18959,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -18752,9 +18972,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "tertiärväg"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr "oklassificerad"
@@ -18768,9 +18988,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "bostadsgata"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr "gårdsgata"
@@ -18800,10 +19020,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "tillfartsväg"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr "buss_spårväg"
@@ -18833,5 +19053,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -18843,10 +19063,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Redigera en bro"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr "Redigera en tunnel"
@@ -18854,19 +19074,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Stigar och småvägar"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "Under byggnad"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "Redigera en väg under byggnad"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "Korsning"
@@ -18882,5 +19102,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "rondell"
@@ -18888,5 +19108,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr "Bruksväg"
@@ -18895,40 +19115,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr "Redigera en bruksväg"
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "Bruksväg"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "grus"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "grus"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "grus"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "grus"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "grus"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr ""
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -18936,5 +19150,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -18942,37 +19156,32 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "Bergsvandringsled"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
-msgstr "Krävande bergsvandringsled"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
-msgstr "Fjällvandringsled"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
-msgstr "Krävande fjällvandringsled"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
-msgstr "Svår fjällvandringsled"
+msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "Stig"
@@ -18981,12 +19190,32 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "Redigera en stig"
 
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
+
 #: build/trans_presets.java:489
-#, fuzzy
 msgid "Wheelchairs"
-msgstr "Rullstol"
+msgstr ""
 
 #: build/trans_presets.java:490
@@ -19002,7 +19231,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "Redigera en gång-/ridstig"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -19015,7 +19243,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "Redigera en cykelbana"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -19050,24 +19277,21 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "Slå ihop i alla fall"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "Redigera en gångstig"
+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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Redigera en gångstig"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr ""
@@ -19075,5 +19299,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "Trappsteg"
@@ -19083,5 +19307,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Redigera en trappa"
@@ -19089,10 +19313,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr "Vägpunkter"
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "Motorvägskorsning"
@@ -19100,15 +19324,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "Redigera en motorvägskorsning"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "Tjänster"
@@ -19116,5 +19340,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr ""
@@ -19122,5 +19346,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -19153,17 +19378,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "Operatör"
@@ -19172,5 +19397,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "Trafikljus"
@@ -19180,5 +19405,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr "Typ av övergångsställe"
@@ -19187,27 +19412,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr "obevakad"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr "trafikljus"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "ö"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr "utan markering"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr "Korsa ridande"
@@ -19215,6 +19440,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr "Korsa cyklande"
@@ -19223,11 +19448,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr "Brittiskt namn på övergångsställe"
@@ -19235,30 +19460,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr "övergångsställe"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr "pelican"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "Stopp"
@@ -19266,5 +19491,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr "Övergångsställe för fotgängare"
@@ -19273,14 +19498,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr "Brittiskt typnamn"
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr "Minirondell"
@@ -19291,14 +19562,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr "Riktning"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr "medurs"
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr "Vändplats"
@@ -19308,26 +19579,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "Stadsgräns"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "Redigera en stadsgränsskylt"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr "Andra namn"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 msgid "Speed Camera"
 msgstr "Hastighetskamera"
 
 #. 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "Nödtelefon"
@@ -19335,5 +19608,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr "Lutning"
@@ -19341,5 +19614,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr "Brant lutning"
@@ -19347,11 +19620,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr "Vadställe"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr "Redigera ett vadställe"
@@ -19359,5 +19639,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr "Bergspass"
@@ -19365,5 +19645,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr "Redigera ett bergspass"
@@ -19375,7 +19655,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "Höjd"
@@ -19383,5 +19663,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Hinder"
@@ -19389,5 +19669,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr "Trafikkon"
@@ -19395,5 +19675,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr "Redigera en trafikkon"
@@ -19438,16 +19718,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "Tillåten trafik:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr ""
@@ -19456,5 +19736,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr ""
@@ -19462,5 +19742,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr "Färist"
@@ -19468,10 +19748,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr "Redigera en färist"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr "Bussfålla"
@@ -19479,15 +19759,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr "Spikhinder"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr "Redigera spikhinder"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "Betalstation"
@@ -19495,5 +19775,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "Redigera betalstation"
@@ -19501,10 +19781,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr "Gränskontroll"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr "Redigera en gränskontroll"
@@ -19514,5 +19794,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr "Häck"
@@ -19521,12 +19801,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:817 build/trans_presets.java:819
 msgid "Fence"
 msgstr "Stängsel"
 
-#. item "Barriers/Fence"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "Mur"
@@ -19534,5 +19826,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "Stadsmur"
@@ -19541,5 +19833,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr "Stödmur"
@@ -19551,15 +19843,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr "Ingång"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr "Redigera en ingång"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "Grind"
@@ -19567,50 +19860,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr "Redigera en grind"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr "Bom"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr "Redigera en bom"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr "Taggtrådsgrind"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr "Redigera en taggtrådsgrind"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr "Fösgrind"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr "Redigera en fösgrind"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr "Manshål"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr "Redigera ett manshål"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr "Stätta"
@@ -19618,25 +19911,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr "Redigera en stätta"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr "Vändkors"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr "Redigera vändkors"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr "Utfallsport"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr "Redigera en utfallsport"
@@ -19647,11 +19940,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "Vatten"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "Källa"
@@ -19659,5 +19952,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "Redigera en källa"
@@ -19665,5 +19958,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr "Avlopp"
@@ -19671,10 +19964,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr "Redigera en avloppsränna"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "Bäck"
@@ -19682,10 +19986,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "Redigera en bäck"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "Kanal"
@@ -19693,10 +19997,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "Redigera en kanal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "Flod"
@@ -19706,5 +20010,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "Redigera en flod"
@@ -19712,15 +20016,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Redigera vatten"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "Redigera land"
@@ -19728,15 +20032,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr "Hamnbassäng"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr "Redigera användning av mark för hamnbassäng"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr "Resevoar"
@@ -19744,15 +20048,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr "Redigera användning av mark för resevoar"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr "Täckt resevoar"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr "Redigera täckt resevoar"
@@ -19760,5 +20064,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "Flodbank"
@@ -19767,10 +20071,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "Redigera en flodbank"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr "Våtmark"
@@ -19781,14 +20085,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr "Redigera våtmark"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "träsk"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr "mosse"
@@ -19802,35 +20106,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr "kärr"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr "vassbädd"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr "saltäng"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr "marskland"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr "mangroveträsk"
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "Lera"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr "Redigera lera"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "Strand"
@@ -19838,20 +20142,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "Redigera strand"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "Bukt"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "Redigera bukt"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "Stup"
@@ -19859,10 +20163,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "Redigera stup"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "Kustlinje"
@@ -19870,5 +20174,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "Redigera kustlinje"
@@ -19876,5 +20180,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "Färjelinje"
@@ -19882,5 +20186,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr "Redigera en färjelinje"
@@ -19889,5 +20193,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr "Varv"
@@ -19895,10 +20199,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr "Redigera ett varv"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "Docka"
@@ -19906,5 +20210,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr "Redigera en docka"
@@ -19912,5 +20216,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "Damm"
@@ -19918,15 +20222,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "Redigera en damm"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr "Vattenpunkter"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr "Slussport"
@@ -19935,5 +20239,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr "Överfallsdamm"
@@ -19941,20 +20245,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr "Redigera en överfallsdamm"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "Vattenfall"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "Redigera ett vattenfall"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr "Vändplats"
@@ -19963,15 +20267,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr "Småbåtshamn"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr "Redigera en småbåtshamn"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "Pir"
@@ -19979,10 +20283,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "Redigera pir"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr "Färjeterminal"
@@ -19990,10 +20294,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr "Redigera en färjeterminal"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr "Slip"
@@ -20003,20 +20307,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr "Redigera en slip"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "Järnväg"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "Järnväg"
@@ -20024,5 +20328,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr "Redigera en järnväg"
@@ -20031,139 +20335,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr ""
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr "bangård"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr "sidospår"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr "stickspår"
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr "räls"
+
+#. 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:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+msgid "Voltage"
+msgstr "Spänning"
+
+#. 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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr "Smalspår"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr "Redigera en smalspårig järnväg"
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr "Monorail"
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr "Redigera en monorailbana"
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr "Museijärnväg"
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr "Redigera en museijärnväg"
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr ""
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "Tunnelbana"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "Redigera en tunnebana"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "Spårvagn"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr "Redigera en spårväg"
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr "Spårbussväg"
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr "Redigera en spårbussväg"
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "Järnväg utan trafik"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "Redigera en järnväg utan trafik"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr "Valfria typer"
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr "bangård"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr "sidospår"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr "stickspår"
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr "Smalspår"
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr "Redigera en smalspårig järnväg"
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr "Monorail"
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr "Redigera en monorailbana"
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr "Museijärnväg"
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr "Redigera en museijärnväg"
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr ""
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr ""
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "Tunnelbana"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "Redigera en tunnebana"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "Spårvagn"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr "Redigera en spårväg"
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr "Spårbussväg"
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr "Redigera en spårbussväg"
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "Järnväg utan trafik"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "Redigera en järnväg utan trafik"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "Nedlagd järnväg"
@@ -20172,5 +20715,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr "Plankorsning"
@@ -20179,5 +20722,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr "Järnvägsövergång"
@@ -20187,5 +20730,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr "Typ av övergångsställe"
@@ -20193,5 +20736,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "Vändskiva"
@@ -20200,10 +20743,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr "Linbana"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "Stollift"
@@ -20211,10 +20761,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr "Redigera en stollift"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr "Släplift"
@@ -20222,10 +20772,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr "Redigera en släplift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "Linbana"
@@ -20233,10 +20783,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "Redigera linbana"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr ""
@@ -20244,10 +20794,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20255,12 +20805,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr ""
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "Bränsle"
@@ -20270,9 +20833,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Redigera bränsle"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20326,32 +20946,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "Öppettider"
@@ -20410,94 +21030,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20509,5 +21205,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20517,5 +21213,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Redigera en parkeringsplats"
@@ -20526,25 +21222,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr "Referensnummer"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "flervånings-"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "ytbeläggning"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr "underjordisk"
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr ""
@@ -20553,48 +21249,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "Avgift"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr "Handikappplatser"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "Biltvätt"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "Redigera en biltvätt"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "Bilverkstad"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "Redigera en bilverkstad"
@@ -20602,5 +21298,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "Uthyrning"
@@ -20609,10 +21305,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "Redigera biluthyrning"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr "Bilpool"
@@ -20620,5 +21316,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr "Redigera bilpool"
@@ -20626,10 +21322,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "Redigera en cykelparkering"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr "Kapacitet"
@@ -20638,15 +21334,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "Redigera en cykeluthyrning"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Kollektivtrafik"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -20656,5 +21352,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -20662,5 +21358,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr "UIC-klassificering"
@@ -20668,5 +21364,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr "Järnvägshållplats"
@@ -20674,5 +21370,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr "Redigera hållplats"
@@ -20680,5 +21376,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "Spårvagnshållplats"
@@ -20687,5 +21383,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "Redigera spårvagnshållplats"
@@ -20693,5 +21389,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "Plattform"
@@ -20700,5 +21396,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "Redigera plattform"
@@ -20710,5 +21406,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr "Referens (spårnummer)"
@@ -20716,10 +21412,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr "Område"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "Tunnelbaneingång"
@@ -20728,10 +21424,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "Redigera tunnelbaneingång"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr "Rullstol"
@@ -20740,5 +21436,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "Bussterminal"
@@ -20747,5 +21443,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "Redigera en bussterminal"
@@ -20753,5 +21449,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "Busshållplats"
@@ -20761,5 +21457,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "Redigera en busshållplats"
@@ -20768,25 +21464,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr "Vindskydd"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "Bänk"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr "Bussplattform"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr "Redigera en bussplattform"
@@ -20794,5 +21491,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "Taxi"
@@ -20800,5 +21497,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "Redigera en taxistation"
@@ -20806,32 +21503,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "Flygplats"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr ""
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr "IATA"
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr "ICAO"
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+msgid "Beacon"
+msgstr "Fyrbåk"
+
+#. 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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr "Turism"
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Logi"
@@ -20843,5 +21635,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotell"
@@ -20850,15 +21642,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "Redigera ett hotell"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "Stjärnor"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr "Motell"
@@ -20866,20 +21658,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr "Redigera ett motell"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr "Pensionat"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr "Redigera pensionat"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "Fäbod"
@@ -20887,10 +21679,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr "Redigera fäbod"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr "Vandrarhem"
@@ -20898,30 +21690,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr "Redigera ett vandrarhem"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr "Alphydda"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr "Redigera alphydda"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr "Husvagnscamping"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr "Redigera en husvagnscamping"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "Campingplats"
@@ -20929,10 +21721,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr "Redigera en campingplats"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Mat+Dryck"
@@ -20943,5 +21735,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurang"
@@ -20949,5 +21741,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "Redigera en restaurang"
@@ -20955,5 +21747,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr "Kök"
@@ -20961,61 +21753,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "italienskt"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "kinesiskt"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "hamburgare"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "grekiskt"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "tyskt"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "indiskt"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "lokalt"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "turkiskt"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "asiatiskt"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "thailändskt"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "mexikanskt"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "japanskt"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "Snabbmat"
@@ -21023,9 +21827,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "Redigera en snabbmatsrestaurang"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "Kafé"
@@ -21033,9 +21845,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "Redigera kafé"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "Pub"
@@ -21043,18 +21855,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "Redigera pub"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr "Redigera Biergarten"
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr ""
@@ -21062,9 +21874,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "Nattklubb"
@@ -21072,24 +21884,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "Redigera nattklubb"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Turism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr "Sevärdhet"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr "Redigera sevärdhet"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Museum"
@@ -21097,9 +21909,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Redigera museum"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Zoo"
@@ -21108,9 +21920,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Redigera zoo"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "Utsiktsplats"
@@ -21118,24 +21930,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "Redigera utsiktsplats"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr "Utsiktstorn"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "Nöjespark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr "Redigera en nöjespark"
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "Konst"
@@ -21143,5 +21955,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "Redigera konstverk"
@@ -21149,19 +21961,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Karta"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr ""
@@ -21199,5 +22011,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -21205,28 +22017,28 @@
 msgstr "gata"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr ""
@@ -21236,5 +22048,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr "Rutter visas för:"
@@ -21242,5 +22054,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr "Vandringsled"
@@ -21248,6 +22060,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "Cykling"
@@ -21255,5 +22067,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr ""
@@ -21261,6 +22073,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "Skidåkning"
@@ -21268,5 +22080,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr ""
@@ -21274,46 +22086,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr "Informationstavla"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "historiskt"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr "naturfenomen"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr "djurliv"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr ""
@@ -21321,29 +22133,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr "Redigera vindskydd"
@@ -21351,25 +22163,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr "Eldstad"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "Picknickplats"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "Redigera picknickplats"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Historiska platser"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Slott"
@@ -21378,19 +22190,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Redigera slott"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Redigera ruiner"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Utgrävningsplats"
@@ -21399,9 +22211,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "Redigera utgrävningsplats"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "Krigsskådeplats"
@@ -21409,10 +22221,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "Redigera krigsskådeplats"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr "Paleografisk plats"
@@ -21420,5 +22232,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr "Redigera paleografisk plats"
@@ -21426,15 +22238,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "Redigera monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "Minnesmärke"
@@ -21442,55 +22254,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "Redigera minnesmärke"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr "Vägkors"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr "Redigera ett vägkors"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr "Vägaltare"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr "Redigera ett vägaltare"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Nöje"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "Badanläggning"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "Redigera badanläggning"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Lekplats"
@@ -21498,35 +22310,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Redigera lekplats"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Fiske"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "Redigera fiske"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr "Idrott"
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr "Sportfaciliteteter"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Redigera stadion"
@@ -21540,6 +22352,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "välj sport:"
@@ -21931,6 +22743,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -21964,225 +22776,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr "flera"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "bågskytte"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr "friidrott"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "australisk fotboll"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "basket"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr "boule"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr "kanot"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "klättring"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr "kricket_nät"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr "krocket"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "cykling"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr "hundracing"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr "ridsport"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "amerikansk fotboll"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "gymnastik"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "ishockey"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr "hästkapplöpning"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr "motorsport"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr "rackets"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "skytte"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr "skridskoåkning"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "skidåkning"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "fotboll"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "simning"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "Sporthall"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "Redigera sporthall"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr "Plan"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr "Redigera plan"
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr "Bana"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr "Redigera bana"
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "Golfbana"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "Redigera golfbana"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "Redigera minigolfbana"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr "Flera"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr "Redigera flersportsfacilitet"
@@ -22221,21 +23033,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "typ"
@@ -22274,203 +23086,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr "plan"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "sporthall"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr "Friidrott"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr "Redigera friidrott"
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "Bågskytte"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "Redigera bågskytte"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "Klättring"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "Redigera klättring"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr "Kanotpaddling"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr "Redigera kanotpaddling"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr "Redigera cykling"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "Hundkapplöpning"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr "Redigera hundkapplöpning"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr "Ridsport"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr "Redigera ridsport"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr "Hästkapplöpning"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr "Redigera hästkapplöpning"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr "Redigera gymnastik"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr "Redigera motorsport"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr "Skridskoåkning"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr "Redigera skridskoåkning"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr "Redigera skateboard"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "Simning"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "Redigera simning"
@@ -22478,56 +23290,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr "Redigera skidåkning"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr "Skidspårstyp"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr "utförsåkning"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr "längdskidåkning"
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr "Svårighetsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr "nybörjare"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr "lätt"
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr ""
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr "ospårat"
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "Skytte"
@@ -22535,182 +23343,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "Redigera skytte"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "Bollsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "Fotboll"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr "Redigera fotboll"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "Amerikansk fotboll"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr "Redigera amerikansk fotboll"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr "Australisk fotboll"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr "Redigera australisk fotboll"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr "Redigera baseball"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "Basket"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "Redigera basket"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr "Redigera golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "golf_bana"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr "Redigera boule"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr "Redigera cricket"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr "Cricketnät"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr "Redigera cricketnät"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr "Redigera krocket"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "Ishockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "Redigera ishockey"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr "Redigera pelota"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr "Rackets"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr "Redigera rackets"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr "Redigera rugby"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "Redigera bordtennis"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "Redigera tennis"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Byggnader"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "Byggnad"
@@ -22718,5 +23526,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Offentlig byggnad"
@@ -22724,10 +23532,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Redigera offentlig byggnad"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "Stadshus"
@@ -22735,10 +23543,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "Redigera stadshus"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Ambassad"
@@ -22746,10 +23554,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Redigera ambassad"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "Domstol"
@@ -22758,10 +23566,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "Redigera domstol"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Fängelse"
@@ -22770,10 +23578,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Redigera fängelse"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Polisstation"
@@ -22783,10 +23591,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Redigera polisstation"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "Brandstation"
@@ -22795,10 +23603,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "Redigera brandstation"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Postkontor"
@@ -22806,5 +23614,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Redigera postkontor"
@@ -22812,15 +23620,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "Barndaghem"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "Redigera barndaghem"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "Skola"
@@ -22828,10 +23636,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "Redigera skola"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "Högskola/universitet"
@@ -22839,10 +23647,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "Redigera högskola/universitet"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "Högskola"
@@ -22850,5 +23658,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "Redigera högskola"
@@ -22856,5 +23664,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Biograf"
@@ -22863,10 +23671,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Redigera biograf"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "Bibliotek"
@@ -22875,9 +23683,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "Redigera bibliotek"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "Konstcenter"
@@ -22885,10 +23693,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "Redigera konstcenter"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Teater"
@@ -22897,10 +23705,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Redigera teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "Religiös helgedom"
@@ -22910,5 +23718,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "Redigera religiös helgedom"
@@ -22917,6 +23725,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "Religion"
@@ -22925,66 +23733,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "buddism"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "kristendom"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "hinduism"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "judendom"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "islam"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr "daoism"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr "zoroastrianism"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr "Samfund"
@@ -22993,81 +23801,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr "anglikaner"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "baptister"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "katoliker"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr "evangelister"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr "jehovas_vittnen"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "luteraner (inkl. Svenska kyrkan)"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr "metodister"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr "mormoner"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "ortodoxa"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr "pinstvänner"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr "presbytarianer"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "protestanter"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr "kväkare"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr "shiamuslimer"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr "sunnimuslimer"
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Adresser"
@@ -23076,5 +23884,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Redigera adressinformation"
@@ -23082,5 +23890,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "Husnummer"
@@ -23088,25 +23896,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "Husnamn"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Gatunamn"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "Stadsnamn"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "Landskod"
@@ -23115,5 +23923,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "Redigera adressinterpolation"
@@ -23121,61 +23929,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr "Numreringsschema"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "udda"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "jämn"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr "Byggnadsverk"
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "Fabrik"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "Redigera fabriksbyggnad"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Torn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Redigera torn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr ""
@@ -23183,25 +23991,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Vattentorn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Redigera vattentorn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "Gasklocka"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "Redigera gasklocka"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "Fyrtorn"
@@ -23209,10 +24017,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "Fyrtorn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Väderkvarn"
@@ -23220,10 +24028,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Redigera väderkvarn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Rörledning"
@@ -23232,37 +24040,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Redigera rörledning"
 
-#: build/trans_presets.java:2198
-msgid "oil"
-msgstr ""
-
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
 msgid "gas"
 msgstr "naturgas"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr ""
+
+#: build/trans_presets.java:2353
+msgid "oil"
+msgstr ""
+
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "Reningsverk"
@@ -23272,10 +24080,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "Redigera reningsverk"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Kran"
@@ -23283,21 +24091,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Redigera kran"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr "Fyrbåk"
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr "Redigera fyrbåk"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "Mätpunkt"
@@ -23305,10 +24108,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "Redigera mätpunkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "Övervakning"
@@ -23316,11 +24119,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Redigera övervakningskamera"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "Kraftverk"
@@ -23330,35 +24145,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "Redigera ett kraftverk"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "vindkraft"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "vattenkraft"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "fossila bränslen"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "kärnkraft"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "kolkraft"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr "solkraft"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "Kraftstation"
@@ -23367,10 +24182,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "Redigera en kraftstation"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -23379,5 +24194,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "Redigera en transformatorstation"
@@ -23385,10 +24200,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "Kraftledningsmast"
@@ -23399,23 +24214,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "Redigera en kraftledningsmast"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "Kraftledning"
@@ -23424,79 +24239,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "Redigera en kraftledning"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr ""
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "Spänning"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr "Inrättningar"
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Toaletter"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr "Anteckning"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "Brevlåda"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Telefon"
@@ -23505,5 +24315,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Redigera en telefon"
@@ -23511,5 +24321,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Mynt"
@@ -23517,5 +24327,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "Anteckningar"
@@ -23523,5 +24333,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr "Betalkort"
@@ -23529,5 +24339,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr "Kontokort"
@@ -23535,15 +24345,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Återvinning"
@@ -23552,5 +24362,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Redigera en återvinningsstation"
@@ -23558,63 +24368,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "Burkar"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "Kläder"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "Papper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "Metallskrot"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+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:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr ""
@@ -23693,5 +24514,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -23701,31 +24522,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr "Jakttorn"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr "Redigera ett jakttorn"
@@ -23734,30 +24555,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "Höjd"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr "låg"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr "Dölj"
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr "Lås"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "Fontän"
@@ -23766,10 +24587,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "Redigera en fontän"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "Dricksvatten"
@@ -23778,10 +24599,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "Redigera dricksvattensfacilitet"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr ""
@@ -23789,15 +24623,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Affärer"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr ""
@@ -23805,10 +24639,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "Redigera bilförsäljare"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr ""
@@ -23817,28 +24651,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "Redigera cykelaffär"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "Stormarknad"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "Redigera stormarknad"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr "Hygien"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr "Redigera hygienbutik"
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr "Närköp"
@@ -23846,9 +24680,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr "Redigera närköp"
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -23856,27 +24690,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "Redigera kiosk"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr "Bokhandel"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr "Redigera bokhandel"
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr "Resebyrå"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr "Redigera resebyrå"
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "Automat"
@@ -23884,5 +24718,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "Redigera en automat"
@@ -23890,88 +24724,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "Varor till försäljning"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr "biljetter för allmänna transportmedel"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr "parkeringsbiljetter"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "mat"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "dryck"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "godis"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "cigaretter"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "foton"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "djurmat"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "tidningar"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "leksaker"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "frimärken"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr "tamponger"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr "hundpåsar"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "Slakteri"
@@ -23979,9 +24813,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "Redigera slakteri"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "Bageri"
@@ -23989,9 +24823,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "Redigera bageri"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "Florist"
@@ -23999,18 +24833,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "Redigera florist"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr "Alkohol"
@@ -24018,54 +24852,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr "Redigera alkoholbutik"
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr "Drycker"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr "Dator"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "Redigera datoraffär"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr "Elektronik"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "Redigera elektronikaffär"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr "Redigera hifi-affär"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr "Möbler"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "Redigera möbelaffär"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr "Trädgårdscenter"
@@ -24073,9 +24907,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr "Redigera trädgårdscenter"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr "Järnvaror"
@@ -24083,9 +24917,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr "Redigera järnaffär"
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "Gör-det-själv-affär"
@@ -24093,54 +24927,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "Redigera gör-det-själv-affär"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr "Kontorsmaterial"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr "Redigera pappershandel"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "Hårfrisör"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "Redigera hårfrisör"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr "Skor"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "Redigera skoaffär"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr "Leksaker"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "Redigera leksaksaffär"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr "Videobutik"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr "Redigera videobutik"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Kemtvätt"
@@ -24148,9 +24982,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Redigera kemtvätt"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Tvätteri"
@@ -24158,9 +24992,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Redigera tvätteri"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr "Friluftsliv"
@@ -24168,28 +25002,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr "Redigera affär för friluftsliv"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr "Redigera sportaffär"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr "Optiker"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "Redigera optiker"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Pengar"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Bank"
@@ -24197,14 +25031,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Redigera bank"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "Uttagsautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Växlingskontor"
@@ -24212,5 +25046,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Redigera växlingskontor"
@@ -24218,15 +25052,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "Redigera uttagsautomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Hälsovård"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "Läkare"
@@ -24234,18 +25068,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "Redigera läkare"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "Tandläkare"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "Redigera tandläkare"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -24253,5 +25087,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Redigera apotek"
@@ -24259,9 +25093,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr "Receptutlämnande"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Sjukhus"
@@ -24269,10 +25103,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Redigera sjukhus"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr ""
@@ -24281,5 +25115,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -24288,20 +25122,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr "Använd internationellt format, ex +12-345-67890"
@@ -24309,5 +25143,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "Veterinär"
@@ -24316,64 +25150,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "Redigera veterinär"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr "Geografi"
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Platser"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Redigera en kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Redigera land"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "Delstat"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "Redigera delstat"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "Redigera region"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr "Län"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr "Redigera län"
@@ -24381,15 +25215,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "Stad"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "Redigera stad"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "Småstad"
@@ -24397,10 +25231,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "Redigera småstad"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "Förort"
@@ -24408,25 +25242,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "Redigera förort"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Mindre tätort"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Redigera mindre tätort"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "Småort"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "Redigera småort"
@@ -24434,5 +25268,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr "Plats"
@@ -24440,10 +25274,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr "Redigera plats"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "Ö"
@@ -24451,10 +25285,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Redigera ö"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr "Holme"
@@ -24462,5 +25296,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr "Redigera holme"
@@ -24468,5 +25302,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "Grottöppning"
@@ -24474,10 +25308,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "Redigera en grottöppning"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Topp"
@@ -24485,10 +25319,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Redigera topp"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "Glaciär"
@@ -24496,10 +25330,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "Redigera en glaciär"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "Vulkan"
@@ -24507,70 +25341,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "Redigera en vulkan"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Gränser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "Nationell"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "Redigera nationsgränser"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "Administrativ"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "Redigera administrativa gränser"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr "Civilrättslig"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr "Redigera en civilrättslig gräns"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr "Politisk"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "Redigera politiska gränser"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr "Nationalpark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "Redigera gräns för nationalpark"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Markanvändning"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Träd"
@@ -24579,15 +25413,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Redigera ett träd"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "Botaniskt namn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "Naturskog"
@@ -24596,5 +25430,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "Redigera naturskog"
@@ -24602,17 +25436,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "barrskog"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "lövskog"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "blandskog"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "Kulturskog"
@@ -24621,14 +25455,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "Redigera användning av mark för skogsbruk"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "Redigera naturreservat"
@@ -24636,25 +25470,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr "Bergsluttning (med lösa stenar)"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr "Redigera bergssluttning (med lösa stenar)"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr "Buskage"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr "Redigera buskage"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr "Höglandshed"
@@ -24662,10 +25496,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr "Redigera en höglandshed"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr "Hed"
@@ -24673,5 +25507,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "Redigera hed"
@@ -24679,5 +25513,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr "Gårdsplan"
@@ -24686,45 +25520,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr "Redigera markanvändning som gårdsplan"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "Jordbruksmark"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr "Redigera användning av mark för jordbruk"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr "Äng"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr "Redigera markanvändning som äng"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "Redigera användning av mark för vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr "Kolonilotter"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr "Redigera användning av mark för koloniområden"
@@ -24732,25 +25566,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "Trädgård"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "Redigera trädgård"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "Gräs"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr "Redigera markanvändning som gräsyta"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr "Allmänning"
@@ -24758,10 +25592,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 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:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr "Allmänning"
@@ -24769,20 +25603,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr "Redigera allmänning"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "Redigera park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr "Fritidsområde"
@@ -24790,5 +25624,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr "Redigera användning av mark för fritidsområde"
@@ -24796,15 +25630,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "Bostadsområde"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 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:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "Kyrkogård"
@@ -24812,9 +25646,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Redigera kyrkogård"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "Begravningsplats"
@@ -24822,39 +25656,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "Redigera användning av mark för begravningsplats"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "Detaljhandel"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr "Redigera användning av mark för detaljhandel"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "Affärsområde"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 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:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr "Redigera användning av mark för industriområde"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr "Järnvägsmark"
@@ -24862,15 +25696,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 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:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "Militärt område"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr "Redigera användning av mark för militärt område"
@@ -24878,50 +25712,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "Byggnadsplats"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "Redigera markanvändning som byggnadsplats"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr "Deponi"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 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:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "Stenbrott"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "Redigera användning av mark för stenbrott"
@@ -24931,5 +25765,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr "Redigera en multipolygon"
@@ -24938,10 +25772,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr "yttre segement"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr "inre segment"
@@ -24949,5 +25783,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr ""
@@ -24956,5 +25790,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -24962,34 +25796,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr "Begränsning"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr "ingen_vänstersväng"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr "ingen_högersväng"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr "inte_rakt_fram"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr "ingen_u_sväng"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr "enbart_högersväng"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr "enbart_vänstersväng"
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr "enbart_rakt_fram"
@@ -24998,15 +25832,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr "från sträcka"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr "via nod eller sträcka"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr "till sträcka"
@@ -25014,5 +25848,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr "Rutt"
@@ -25021,5 +25855,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr "Redigera rutt"
@@ -25027,5 +25861,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr "Ruttyp"
@@ -25116,5 +25950,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -25124,17 +25958,17 @@
 msgstr "cykel"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr ""
@@ -25194,5 +26028,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -25201,9 +26035,9 @@
 msgstr "fot"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr ""
@@ -25217,10 +26051,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "tunnelbana"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr ""
@@ -25228,31 +26062,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr ""
@@ -25261,106 +26095,31 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 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 ""
 
@@ -25897,77 +26656,4 @@
 msgid "highway_track"
 msgstr "landsvägsspår"
-
-#. 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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
-msgstr "räls"
 
 #. color rail
@@ -26355,7 +27041,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "baptister"
+msgstr ""
 
 #. color manmade
@@ -29494,42 +30179,375 @@
 msgstr ""
 
+#~ msgid "Move"
+#~ msgstr "Flytta"
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Downloading..."
+#~ msgstr "Hämtar..."
+
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "bild"
+#~ msgstr[1] "bilder"
+
+#~ msgid "timezone difference: "
+#~ msgstr "tidsskillnad: "
+
+#~ msgid "Unsaved Changes"
+#~ msgstr "Osparade ändringar"
+
+#~ msgid "Object"
+#~ msgstr "Objekt"
+
+#~ msgid "Unknown version"
+#~ msgstr "Okänd version"
+
+#~ msgid "Incorrect password or username."
+#~ msgstr "Felaktigt lösenord eller användarnamn."
+
+#~ msgid "unnamed"
+#~ msgstr "namnlös"
+
+#~ msgid "Image"
+#~ msgstr "Bild"
+
+#~ msgid "Select a bookmark first."
+#~ msgstr "Välj ett bokmärke först."
+
+#~ msgid "Unknown file extension."
+#~ msgstr "Okänd filändelse."
+
+#~ msgid "All the ways were empty"
+#~ msgstr "Alla sträckor var tomma"
+
+#~ msgid "Please select at least one task to download"
+#~ msgstr "Välj åtminstone en uppgift att hämta"
+
+#~ msgid "JOSM Online Help"
+#~ msgstr "Onlinehjälp för JOSM"
+
+#~ msgid "Can only edit help pages from JOSM Online Help"
+#~ msgstr "Det går bara att redigera hjälpsidor från onlinehjälpen för JOSM"
+
+#~ msgid "Error while loading page {0}"
+#~ msgstr "Fel vid inläsning av sida{0}"
+
+#~ msgid "Open in Browser"
+#~ msgstr "Öppna i webbläsare"
+
+#~ msgid ""
+#~ "The selected nodes have differing relation memberships.  Do you still "
+#~ "want to merge them?"
+#~ msgstr ""
+#~ "De valda noderna har olika relationsmedlemsskap. Vill du ändå slå ihop "
+#~ "dem?"
+
+#~ msgid "Merge nodes with different memberships?"
+#~ msgstr "Slå ihop noder med olika medlemskap?"
+
+#~ msgid "No document open so nothing to save."
+#~ msgstr ""
+#~ "Det finns inte något öppet dokument, så det finns inte något att spara."
+
+#~ msgid "Expected closing parenthesis."
+#~ msgstr "En avslutande parentes förväntades"
+
+#~ msgid "Conflicting relation"
+#~ msgstr "Relationskonflikt"
+
+#~ msgid "Split way segment"
+#~ msgstr "Dela delsträcka"
+
+#~ msgid "position"
+#~ msgstr "position"
+
+#~ msgid "different"
+#~ msgstr "olik"
+
+#~ msgid "false"
+#~ msgstr "falsk"
+
+#~ msgid "true"
+#~ msgstr "sann"
+
+#~ msgid "their version:"
+#~ msgstr "deras version:"
+
+#~ msgid "{0} object has conflicts:"
+#~ msgid_plural "{0} objects have conflicts:"
+#~ msgstr[0] "{0} objekt har konflikter:"
+#~ msgstr[1] "{0} objekt har konflikter:"
+
+#~ msgid "my version:"
+#~ msgstr "min version:"
+
+#~ msgid "Merging conflicts."
+#~ msgstr "Jämkar konflikter"
+
+#~ msgid "Revert"
+#~ msgstr "Återgå"
+
+#~ msgid "Delete the selected layer."
+#~ msgstr "Ta bort valt lager."
+
+#~ msgid "Data Layer"
+#~ msgstr "Datalager"
+
+#~ msgid "No data imported."
+#~ msgstr "Ingen data importerad."
+
+#~ msgid "Contact {0}..."
+#~ msgstr "Kontakta {0}..."
+
+#~ msgid "Load Selection"
+#~ msgstr "Hämta urval"
+
+#~ msgid "Tags (empty value deletes tag)"
+#~ msgstr "Taggar (tomt värde tar bort taggen)"
+
+#~ msgid "Occupied By"
+#~ msgstr "Innehas av"
+
+#~ msgid "Add all currently selected objects as members"
+#~ msgstr "Lägg till alla för närvarande valda objekt som medlemmar"
+
+#~ msgid "Cannot connect to server."
+#~ msgstr "Kan inte ansluta till server."
+
+#~ msgid "Error parsing server response."
+#~ msgstr "Fel vid inläsning av serverns svar."
+
+#~ msgid "There were conflicts during import."
+#~ msgstr "Konflikter upptäcktes under import."
+
+#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
+#~ msgstr "Kan inte lästa tidpunkt \"{0}\" från punkt {1} x {2}"
+
+#~ msgid "No images with readable timestamps found."
+#~ msgstr "Inga bilder med läsbara tidsangivelser hittades."
+
+#~ msgid "No time for point {0} x {1}"
+#~ msgstr "Tid saknas för punkt {0} x {1}"
+
+#~ msgid "Images for {0}"
+#~ msgstr "Bilder för {0}"
+
+#~ msgid "Read GPX..."
+#~ msgstr "Läs in GPX..."
+
+#~ msgid "GPS start: {0}"
+#~ msgstr "GPS startpunkt: {0}"
+
+#~ msgid "current delta: {0}s"
+#~ msgstr "nuvarande delta: {0}s"
+
+#~ msgid "GPS end: {0}"
+#~ msgstr "GPS slutpunkt: {0}"
+
+#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
+#~ msgstr "Ange visat datum (mm/dd/yyyy HH:MM:SS)"
+
+#~ msgid "Sync clock"
+#~ msgstr "Synka klocka"
+
+#~ msgid "The date in file \"{0}\" could not be parsed."
+#~ msgstr "Datum i fil \"{0}\" kunde inte tolkas."
+
+#~ msgid "There is no EXIF time within the file \"{0}\"."
+#~ msgstr "Det finns inte någon EXIF-tid i filen\"{0}\"."
+
+#~ msgid "name"
+#~ msgstr "namn"
+
+#~ msgid "Set the language."
+#~ msgstr "Ange språk"
+
+#~ msgid "Contacting the OSM server..."
+#~ msgstr "Ansluter till OSM-servern"
+
+#~ msgid "Error while parsing"
+#~ msgstr "Fel vid tolkning"
+
+#~ msgid "File not found"
+#~ msgstr "Filen hittades inte"
+
+#~ msgid "Update"
+#~ msgstr "Uppdatera"
+
+#~ msgid "All installed plugins are up to date."
+#~ msgstr "Alla installerade insticksmoduler är av senaste version."
+
+#~ msgid "{0} within the track."
+#~ msgstr "{0} inom spåret."
+
+#~ msgid "Open file (as raw gps, if .gpx)"
+#~ msgstr "Öppna fil (som rå gps, om .gpx)"
+
+#~ msgid ""
+#~ "Parameters are read in the order they are specified, so make sure you "
+#~ "load\n"
+#~ "some data before --selection"
+#~ msgstr ""
+#~ "Parametrar behandlas i den ordning som de anges, så du måste hämta\n"
+#~ "data innan --selection"
+
+#~ msgid ""
+#~ "Activating the updated plugins failed. Check if JOSM has the permission "
+#~ "to overwrite the existing ones."
+#~ msgstr ""
+#~ "Det gick inte att aktivera de uppdaterade insticksmodulerna. Kontrollera "
+#~ "om JOSM har behörighet att skriva över de existerande."
+
+#~ msgid "Download missing plugins"
+#~ msgstr "Hämta saknade insticksmoduler"
+
+#~ msgid "Anonymous"
+#~ msgstr "Anonym"
+
+#~ msgid "Login name (email) to the OSM account."
+#~ msgstr "Användarnamn (epost) för OSM-kontot"
+
+#~ msgid ""
+#~ "Login password to the OSM account. Leave blank to not store any password."
+#~ msgstr ""
+#~ "Lösenord för OSM-kontot. Lämna blankt för att inte spara något lösenord."
+
+#~ msgid "Error during parse."
+#~ msgstr "Fel vid tolkning."
+
+#~ msgid "Plugin not found: {0}."
+#~ msgstr "Insticksmodulen kunde ej hittas: {0}."
+
+#~ msgid "Hint: Some changes came from uploading new data to the server."
+#~ msgstr ""
+#~ "Tips: Några av ändringarna härrör från inskickning av nya data till "
+#~ "servern."
+
+#~ msgid ""
+#~ "There were problems with the following plugins:\n"
+#~ "\n"
+#~ " {0}"
+#~ msgstr ""
+#~ "Det uppstod problem med följande insticksmoduler:\n"
+#~ "\n"
+#~ "\n"
+#~ " {0}"
+
+#~ msgid "Could not download plugin: {0} from {1}"
+#~ msgstr "Kunde inte hämta insticksmodul: {0} från {1}"
+
+#~ msgid ""
+#~ "The plugin could not be removed. Please tell the people you got JOSM from "
+#~ "about the problem."
+#~ msgstr ""
+#~ "Insticksmodulen kunde inte tas bort. Rapportera problemet till de du fick "
+#~ "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"
+#~ msgstr "Motorbåt"
+
+#~ msgid "Cycleway"
+#~ msgstr "Cykelbana"
+
+#~ msgid "Footway"
+#~ msgstr "Gångstig"
+
+#~ msgid "Shop"
+#~ msgstr "Affär"
+
+#~ msgid "Use preset ''{0}''"
+#~ msgstr "Använd snabbval ''{0}''"
+
+#~ msgid "Tagging preset sources"
+#~ msgstr "Källor för snabbval för taggning"
+
+#~ msgid "Tagging preset source"
+#~ msgstr "Källa till snabbval för taggning"
+
+#~ msgid "Add a new tagging preset source to the list."
+#~ msgstr "Lägg till en källa för snabbval för taggning till listan."
+
+#~ msgid "YAHOO (GNOME)"
+#~ msgstr "YAHOO (GNOME)"
+
+#~ msgid "YAHOO (WebKit)"
+#~ msgstr "YAHOO (WebKit)"
+
+#~ msgid "YAHOO (GNOME Fix)"
+#~ msgstr "YAHOO (GNOME Fix)"
+
+#~ msgid "WMS Plugin Help"
+#~ msgstr "Hjälp om WMS-insticksmodulen"
+
+#~ msgid "Help / About"
+#~ msgstr "Hjälp / Om"
+
+#~ msgid "help"
+#~ msgstr "hjälp"
+
+#~ msgid "Validate either current selection or complete dataset."
+#~ msgstr "Validera antingen nuvarande urval eller hela datasetet."
+
+#~ msgid "zoom"
+#~ msgstr "zooma"
+
+#~ msgid "Please enter a search string"
+#~ msgstr "Ange en söksträng"
+
+#~ msgid "Navigation"
+#~ msgstr "Navigation"
+
+#~ msgid "osmarender options"
+#~ msgstr "inställningar för osmarender"
+
+#~ msgid "requested: {0}"
+#~ msgstr "begärd: {0}"
+
+#~ msgid "error loading metadata"
+#~ msgstr "fel vid hämtning av metadata"
+
+#~ msgid "error requesting update"
+#~ msgstr "fel vid begäran om uppdatering"
+
+#~ msgid "Edit Station"
+#~ msgstr "Redigera station"
+
+#~ msgid "Charge"
+#~ msgstr "Avgift"
+
 #~ msgid "Bridleway"
 #~ msgstr "Gång-/Ridstig"
 
-#~ msgid "Cycleway"
-#~ msgstr "Cykelbana"
-
-#~ msgid "Footway"
-#~ msgstr "Gångstig"
+#~ msgid "Track Grade 3"
+#~ msgstr "Bruksväg klass 3"
+
+#~ msgid "Track Grade 2"
+#~ msgstr "Bruksväg klass 2"
 
 #~ msgid "Track Grade 1"
 #~ msgstr "Bruksväg klass 1"
 
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "Redigera en bruksväg klass 1"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "Bruksväg klass 2"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "Redigera en bruksväg klass 2"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "Bruksväg klass 3"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "Redigera en bruksväg klass 3"
+#~ msgid "Track Grade 5"
+#~ msgstr "Bruksväg klass 5"
 
 #~ msgid "Track Grade 4"
 #~ msgstr "Bruksväg klass 4"
 
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "Redigera en bruksväg klass 4"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "Bruksväg klass 5"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "Redigera en bruksväg klass 5"
+#~ msgid "Edit Demanding Mountain Hiking"
+#~ msgstr "Redigera en krävande bergsvandringsled"
+
+#~ msgid "Edit Alpine Hiking"
+#~ msgstr "Redigera en fjällvandringsled"
 
 #~ msgid "Edit Hiking"
@@ -29539,27 +30557,186 @@
 #~ msgstr "Redigera en bergsvandringsled"
 
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "Redigera en krävande bergsvandringsled"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Redigera en fjällvandringsled"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "Redigera en krävande fjällvandringsled"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Redigera en svår fjällvandringsled"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "Id > 0 krävs, har {0}"
-
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "Parametern \"{0}\" får inte vara null"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parametern ''{0}'' får inte vara null"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "förväntade instans av OsmDataLayer eller GpxLayer. Erhöll \"{0}\"."
+#~ msgid "GPX Track loaded"
+#~ msgstr "GPX-spår har hämtats"
+
+#~ msgid ""
+#~ "Revert the state of all currently selected objects to the version "
+#~ "selected in the history list."
+#~ msgstr ""
+#~ "Återställ alla de nu valda objekten till den version som valts i "
+#~ "historiklistan."
+
+#~ msgid "Enable proxy server"
+#~ msgstr "Aktivera proxyserver"
+
+#~ msgid "Proxy server host"
+#~ msgstr "Värd för proxyserver"
+
+#~ msgid "Proxy server username"
+#~ msgstr "Användarnamn för proxyserver"
+
+#~ msgid "Proxy server password"
+#~ msgstr "Lösenord för proxyserver"
+
+#~ msgid "Proxy server port"
+#~ msgstr "Port för proxyserver"
+
+#~ msgid ""
+#~ "The selected ways have differing relation memberships.  Do you still want "
+#~ "to combine them?"
+#~ msgstr ""
+#~ "De valda sträckorna har olika roller i relationen. Vill du ändå slå ihop "
+#~ "dem?"
+
+#~ msgid "Not yet tagged images"
+#~ msgstr "Bilder som inte taggats ännu"
+
+#~ msgid "Images with no exif position"
+#~ msgstr "Bilder utan positionsangivelse i exif"
+
+#~ msgid "EPSG:4326"
+#~ msgstr "EPSG:4326"
+
+#~ msgid "Preparing..."
+#~ msgstr "Förbereder..."
+
+#~ msgid "Plugin requires JOSM update: {0}."
+#~ msgstr "Insticksmodulen kräver en uppdatering av JOSM: {0}."
+
+#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
+#~ msgstr "Överföringen avbröts på grund av fel (väntar nu i fem sekunder):"
+
+#~ msgid "Uploading..."
+#~ msgstr "Skickar in..."
+
+#~ msgid ""
+#~ "(You can change the number of days after which this warning appears<br>by "
+#~ "setting the config option 'pluginmanager.warntime'.)"
+#~ msgstr ""
+#~ "(Du kan ändra det tidsintervall (i dagar) med vilket denna varning "
+#~ "visas<br> med hjälp av inställningen 'pluginmanager.warntime'.)"
+
+#~ msgid "Please report a ticket at {0}"
+#~ msgstr "Lämna in en rapport på {0}"
+
+#~ msgid "Be sure to include the following information:"
+#~ msgstr "Följande information måste finnas med:"
+
+#~ msgid "Include your steps to get to the error (as detailed as possible)!"
+#~ msgstr ""
+#~ "Berätta de steg du genomförde för att nå fram till felet (så detaljerat "
+#~ "som möjligt)!"
+
+#~ msgid "Edit Properties"
+#~ msgstr "Redigera egenskaper"
+
+#~ msgid "GPS unit timezone (difference to photo)"
+#~ msgstr "Tidszon för GPS-enhet (skillnad mot foto)"
+
+#~ msgid "Plugin already exists"
+#~ msgstr "Insticksmodulen finns redan"
+
+#~ msgid "Only two nodes allowed"
+#~ msgstr "Enbart två noder kan vara valda"
+
+#~ msgid "Only one node selected"
+#~ msgstr "Enbart en nod vald"
+
+#~ msgid "Really mark this issue as ''done''?"
+#~ msgstr ""
+#~ "Vill du verkligen sätta status för detta problemfall som \"slutförd\"?"
+
+#~ msgid "Import TCX file as GPS track"
+#~ msgstr "Importera TCX-fil som GPS-spår"
+
+#~ msgid "Import TCX File..."
+#~ msgstr "Importera TCX-fil..."
+
+#~ msgid "AgPifoJ - Geotagged pictures"
+#~ msgstr "AgPifoJ - Geotaggade bilder"
+
+#~ msgid "Open images with AgPifoJ..."
+#~ msgstr "Öppna bilder med AgPifoJ..."
+
+#~ msgid ""
+#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
+#~ msgstr ""
+#~ "<html>Jag kan ta en bild av min GPS-mottagare.<br>Kan detta vara till "
+#~ "nytta?</html>"
+
+#~ msgid "Metacarta Map Rectifier image id"
+#~ msgstr "Id för Metacartas korrigerade kartbild"
+
+#~ msgid "rectifier id={0}"
+#~ msgstr "korrigeringsid={0}"
+
+#~ msgid "Please select the row to copy."
+#~ msgstr "Välj vilken rad du vill kopiera."
+
+#~ msgid "Oberpfalz Geofabrik.de"
+#~ msgstr "Oberpfalz Geofabrik.de"
+
+#~ msgid "YAHOO (WebKit GTK)"
+#~ msgstr "YAHOO (WebKit GTK)"
+
+#~ msgid "Drawbridge"
+#~ msgstr "Klaffbro"
+
+#~ msgid "Found <nd> element in non-way."
+#~ msgstr "Hittade element av typen <nd> på icke-sträcka"
+
+#~ msgid "<nd> has zero ref"
+#~ msgstr "<nd> har nollreferens"
+
+#~ msgid "The base URL for the OSM server (REST API)"
+#~ msgstr "Bas-URL för OSM-servern (REST API)"
+
+#~ msgid "Cannot read place search results from server"
+#~ msgstr "Kan inte läsa sökresultat för plats från servern"
+
+#~ msgid "hikingmap"
+#~ msgstr "vandringskarta"
+
+#~ msgid "citymap"
+#~ msgstr "stadskarta"
+
+#~ msgid "map"
+#~ msgstr "karta"
+
+#~ msgid "bicyclemap"
+#~ msgstr "cykelkarta"
+
+#~ msgid "Use preset ''{0}'' of group ''{1}''"
+#~ msgstr "Använd snabbvalet ''{0}'' i gruppen ''{1}''"
+
+#~ msgid ""
+#~ "Try updating to the newest version of JOSM and all plugins before "
+#~ "reporting a bug."
+#~ msgstr ""
+#~ "Innan du rapporterar in ett fel, försök först att uppdatera till den "
+#~ "nyaste versionen av JOSM och alla insticksmoduler."
+
+#~ msgid "NullPointerException, possibly some missing tags."
+#~ msgstr "NullPointerException, Det saknas förmodligen några taggar."
+
+#~ msgid "Found <member> element in non-relation."
+#~ msgstr "Fann <member>-tagg utanför relation."
+
+#~ msgid "Ill-formed node id"
+#~ msgstr "Felformaterad nod-id"
+
+#~ msgid ""
+#~ "The sources (URL or filename) of tagging preset definition files. See "
+#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
+#~ msgstr ""
+#~ "Källorna (URL eller filnamn) till de filer i vilka snabbval för taggning "
+#~ "definieras. Se http://josm.openstreetmap.de/wiki/TaggingPresets för mer "
+#~ "information."
+
+#~ msgid "Could not read from URL: \"{0}\""
+#~ msgstr "Kunde inte läsa från URL:en: \"{0}\""
+
+#~ msgid "Parsing error in URL: \"{0}\""
+#~ msgstr "Inläsningsfel på URL:en: \"{0}\""
 
 #~ msgid ""
@@ -29572,541 +30749,4 @@
 #~ "Detta kan leda till att noder oavsiktligt tas bort.\n"
 #~ "Är du säker på att du vill fortsätta?"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr "parameter \"{0}\" förväntades inom området 0...{1}, erhöll {2}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "Parameter {0} > 0 krävs. Erhöll {1}."
-
-#~ msgid "Conflicts in data"
-#~ msgstr "Datakonflikter"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "bild"
-#~ msgstr[1] "bilder"
-
-#~ msgid "Move"
-#~ msgstr "Flytta"
-
-#~ msgid "Email"
-#~ msgstr "Email"
-
-#~ msgid "Downloading..."
-#~ msgstr "Hämtar..."
-
-#~ msgid "timezone difference: "
-#~ msgstr "tidsskillnad: "
-
-#~ msgid "Unsaved Changes"
-#~ msgstr "Osparade ändringar"
-
-#~ msgid "Object"
-#~ msgstr "Objekt"
-
-#~ msgid "Unknown version"
-#~ msgstr "Okänd version"
-
-#~ msgid "Incorrect password or username."
-#~ msgstr "Felaktigt lösenord eller användarnamn."
-
-#~ msgid "unnamed"
-#~ msgstr "namnlös"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Angiven tid kunde inte tolkas."
-
-#~ msgid "Image"
-#~ msgstr "Bild"
-
-#~ msgid "Select a bookmark first."
-#~ msgstr "Välj ett bokmärke först."
-
-#~ msgid "Unknown file extension."
-#~ msgstr "Okänd filändelse."
-
-#~ msgid "All the ways were empty"
-#~ msgstr "Alla sträckor var tomma"
-
-#~ msgid "Please select at least one task to download"
-#~ msgstr "Välj åtminstone en uppgift att hämta"
-
-#~ msgid "JOSM Online Help"
-#~ msgstr "Onlinehjälp för JOSM"
-
-#~ msgid "Can only edit help pages from JOSM Online Help"
-#~ msgstr "Det går bara att redigera hjälpsidor från onlinehjälpen för JOSM"
-
-#~ msgid "Error while loading page {0}"
-#~ msgstr "Fel vid inläsning av sida{0}"
-
-#~ msgid "Open in Browser"
-#~ msgstr "Öppna i webbläsare"
-
-#~ msgid ""
-#~ "The selected nodes have differing relation memberships.  Do you still "
-#~ "want to merge them?"
-#~ msgstr ""
-#~ "De valda noderna har olika relationsmedlemsskap. Vill du ändå slå ihop "
-#~ "dem?"
-
-#~ msgid "Merge nodes with different memberships?"
-#~ msgstr "Slå ihop noder med olika medlemskap?"
-
-#~ msgid "No document open so nothing to save."
-#~ msgstr ""
-#~ "Det finns inte något öppet dokument, så det finns inte något att spara."
-
-#~ msgid "Expected closing parenthesis."
-#~ msgstr "En avslutande parentes förväntades"
-
-#~ msgid "Conflicting relation"
-#~ msgstr "Relationskonflikt"
-
-#~ msgid "Split way segment"
-#~ msgstr "Dela delsträcka"
-
-#~ msgid "position"
-#~ msgstr "position"
-
-#~ msgid "different"
-#~ msgstr "olik"
-
-#~ msgid "false"
-#~ msgstr "falsk"
-
-#~ msgid "true"
-#~ msgstr "sann"
-
-#~ msgid "their version:"
-#~ msgstr "deras version:"
-
-#~ msgid "{0} object has conflicts:"
-#~ msgid_plural "{0} objects have conflicts:"
-#~ msgstr[0] "{0} objekt har konflikter:"
-#~ msgstr[1] "{0} objekt har konflikter:"
-
-#~ msgid "my version:"
-#~ msgstr "min version:"
-
-#~ msgid "Merging conflicts."
-#~ msgstr "Jämkar konflikter"
-
-#~ msgid "Revert"
-#~ msgstr "Återgå"
-
-#~ msgid "Delete the selected layer."
-#~ msgstr "Ta bort valt lager."
-
-#~ msgid "Data Layer"
-#~ msgstr "Datalager"
-
-#~ msgid "No data imported."
-#~ msgstr "Ingen data importerad."
-
-#~ msgid "Contact {0}..."
-#~ msgstr "Kontakta {0}..."
-
-#~ msgid "Load Selection"
-#~ msgstr "Hämta urval"
-
-#~ msgid "Tags (empty value deletes tag)"
-#~ msgstr "Taggar (tomt värde tar bort taggen)"
-
-#~ msgid "Occupied By"
-#~ msgstr "Innehas av"
-
-#~ msgid "Add all currently selected objects as members"
-#~ msgstr "Lägg till alla för närvarande valda objekt som medlemmar"
-
-#~ msgid "Cannot connect to server."
-#~ msgstr "Kan inte ansluta till server."
-
-#~ msgid "Error parsing server response."
-#~ msgstr "Fel vid inläsning av serverns svar."
-
-#~ msgid "There were conflicts during import."
-#~ msgstr "Konflikter upptäcktes under import."
-
-#~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
-#~ msgstr "Kan inte lästa tidpunkt \"{0}\" från punkt {1} x {2}"
-
-#~ msgid "No images with readable timestamps found."
-#~ msgstr "Inga bilder med läsbara tidsangivelser hittades."
-
-#~ msgid "No time for point {0} x {1}"
-#~ msgstr "Tid saknas för punkt {0} x {1}"
-
-#~ msgid "Images for {0}"
-#~ msgstr "Bilder för {0}"
-
-#~ msgid "Read GPX..."
-#~ msgstr "Läs in GPX..."
-
-#~ msgid "GPS start: {0}"
-#~ msgstr "GPS startpunkt: {0}"
-
-#~ msgid "current delta: {0}s"
-#~ msgstr "nuvarande delta: {0}s"
-
-#~ msgid "GPS end: {0}"
-#~ msgstr "GPS slutpunkt: {0}"
-
-#~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
-#~ msgstr "Ange visat datum (mm/dd/yyyy HH:MM:SS)"
-
-#~ msgid "Sync clock"
-#~ msgstr "Synka klocka"
-
-#~ msgid "The date in file \"{0}\" could not be parsed."
-#~ msgstr "Datum i fil \"{0}\" kunde inte tolkas."
-
-#~ msgid "There is no EXIF time within the file \"{0}\"."
-#~ msgstr "Det finns inte någon EXIF-tid i filen\"{0}\"."
-
-#~ msgid "name"
-#~ msgstr "namn"
-
-#~ msgid "Set the language."
-#~ msgstr "Ange språk"
-
-#~ msgid "Contacting the OSM server..."
-#~ msgstr "Ansluter till OSM-servern"
-
-#~ msgid "Error while parsing"
-#~ msgstr "Fel vid tolkning"
-
-#~ msgid "File not found"
-#~ msgstr "Filen hittades inte"
-
-#~ msgid "Update"
-#~ msgstr "Uppdatera"
-
-#~ msgid "All installed plugins are up to date."
-#~ msgstr "Alla installerade insticksmoduler är av senaste version."
-
-#~ msgid "{0} within the track."
-#~ msgstr "{0} inom spåret."
-
-#~ msgid "Open file (as raw gps, if .gpx)"
-#~ msgstr "Öppna fil (som rå gps, om .gpx)"
-
-#~ msgid ""
-#~ "Parameters are read in the order they are specified, so make sure you "
-#~ "load\n"
-#~ "some data before --selection"
-#~ msgstr ""
-#~ "Parametrar behandlas i den ordning som de anges, så du måste hämta\n"
-#~ "data innan --selection"
-
-#~ msgid ""
-#~ "Activating the updated plugins failed. Check if JOSM has the permission "
-#~ "to overwrite the existing ones."
-#~ msgstr ""
-#~ "Det gick inte att aktivera de uppdaterade insticksmodulerna. Kontrollera "
-#~ "om JOSM har behörighet att skriva över de existerande."
-
-#~ msgid "Download missing plugins"
-#~ msgstr "Hämta saknade insticksmoduler"
-
-#~ msgid "Anonymous"
-#~ msgstr "Anonym"
-
-#~ msgid "Login name (email) to the OSM account."
-#~ msgstr "Användarnamn (epost) för OSM-kontot"
-
-#~ msgid ""
-#~ "Login password to the OSM account. Leave blank to not store any password."
-#~ msgstr ""
-#~ "Lösenord för OSM-kontot. Lämna blankt för att inte spara något lösenord."
-
-#~ msgid "Error during parse."
-#~ msgstr "Fel vid tolkning."
-
-#~ msgid "Plugin not found: {0}."
-#~ msgstr "Insticksmodulen kunde ej hittas: {0}."
-
-#~ msgid "Hint: Some changes came from uploading new data to the server."
-#~ msgstr ""
-#~ "Tips: Några av ändringarna härrör från inskickning av nya data till "
-#~ "servern."
-
-#~ msgid ""
-#~ "There were problems with the following plugins:\n"
-#~ "\n"
-#~ " {0}"
-#~ msgstr ""
-#~ "Det uppstod problem med följande insticksmoduler:\n"
-#~ "\n"
-#~ "\n"
-#~ " {0}"
-
-#~ msgid "Could not download plugin: {0} from {1}"
-#~ msgstr "Kunde inte hämta insticksmodul: {0} från {1}"
-
-#~ msgid ""
-#~ "The plugin could not be removed. Please tell the people you got JOSM from "
-#~ "about the problem."
-#~ msgstr ""
-#~ "Insticksmodulen kunde inte tas bort. Rapportera problemet till de du fick "
-#~ "JOSM från."
-
-#~ msgid "Do not show again"
-#~ msgstr "Visa inte igen"
-
-#~ msgid "All images"
-#~ msgstr "Alla bilder"
-
-#~ msgid "Shop"
-#~ msgstr "Affär"
-
-#~ msgid "Use preset ''{0}''"
-#~ msgstr "Använd snabbval ''{0}''"
-
-#~ msgid "Tagging preset sources"
-#~ msgstr "Källor för snabbval för taggning"
-
-#~ msgid "Tagging preset source"
-#~ msgstr "Källa till snabbval för taggning"
-
-#~ msgid "Add a new tagging preset source to the list."
-#~ msgstr "Lägg till en källa för snabbval för taggning till listan."
-
-#~ msgid "YAHOO (GNOME)"
-#~ msgstr "YAHOO (GNOME)"
-
-#~ msgid "YAHOO (WebKit)"
-#~ msgstr "YAHOO (WebKit)"
-
-#~ msgid "YAHOO (GNOME Fix)"
-#~ msgstr "YAHOO (GNOME Fix)"
-
-#~ msgid "WMS Plugin Help"
-#~ msgstr "Hjälp om WMS-insticksmodulen"
-
-#~ msgid "Help / About"
-#~ msgstr "Hjälp / Om"
-
-#~ msgid "help"
-#~ msgstr "hjälp"
-
-#~ msgid "Validate either current selection or complete dataset."
-#~ msgstr "Validera antingen nuvarande urval eller hela datasetet."
-
-#~ msgid "zoom"
-#~ msgstr "zooma"
-
-#~ msgid "Please enter a search string"
-#~ msgstr "Ange en söksträng"
-
-#~ msgid "Navigation"
-#~ msgstr "Navigation"
-
-#~ msgid "osmarender options"
-#~ msgstr "inställningar för osmarender"
-
-#~ msgid "requested: {0}"
-#~ msgstr "begärd: {0}"
-
-#~ msgid "error loading metadata"
-#~ msgstr "fel vid hämtning av metadata"
-
-#~ msgid "error requesting update"
-#~ msgstr "fel vid begäran om uppdatering"
-
-#~ msgid "Station"
-#~ msgstr "Station"
-
-#~ msgid "Edit Station"
-#~ msgstr "Redigera station"
-
-#~ msgid "Charge"
-#~ msgstr "Avgift"
-
-#~ msgid "GPX Track loaded"
-#~ msgstr "GPX-spår har hämtats"
-
-#~ msgid ""
-#~ "Revert the state of all currently selected objects to the version "
-#~ "selected in the history list."
-#~ msgstr ""
-#~ "Återställ alla de nu valda objekten till den version som valts i "
-#~ "historiklistan."
-
-#~ msgid "Enable proxy server"
-#~ msgstr "Aktivera proxyserver"
-
-#~ msgid "Proxy server host"
-#~ msgstr "Värd för proxyserver"
-
-#~ msgid "Proxy server username"
-#~ msgstr "Användarnamn för proxyserver"
-
-#~ msgid "Proxy server password"
-#~ msgstr "Lösenord för proxyserver"
-
-#~ msgid "Proxy server port"
-#~ msgstr "Port för proxyserver"
-
-#~ msgid ""
-#~ "The selected ways have differing relation memberships.  Do you still want "
-#~ "to combine them?"
-#~ msgstr ""
-#~ "De valda sträckorna har olika roller i relationen. Vill du ändå slå ihop "
-#~ "dem?"
-
-#~ msgid "Not yet tagged images"
-#~ msgstr "Bilder som inte taggats ännu"
-
-#~ msgid "Images with no exif position"
-#~ msgstr "Bilder utan positionsangivelse i exif"
-
-#~ msgid "EPSG:4326"
-#~ msgstr "EPSG:4326"
-
-#~ msgid "Preparing..."
-#~ msgstr "Förbereder..."
-
-#~ msgid "Plugin requires JOSM update: {0}."
-#~ msgstr "Insticksmodulen kräver en uppdatering av JOSM: {0}."
-
-#~ msgid "Transfer aborted due to error (will wait for 5 seconds):"
-#~ msgstr "Överföringen avbröts på grund av fel (väntar nu i fem sekunder):"
-
-#~ msgid "Uploading..."
-#~ msgstr "Skickar in..."
-
-#~ msgid ""
-#~ "(You can change the number of days after which this warning appears<br>by "
-#~ "setting the config option 'pluginmanager.warntime'.)"
-#~ msgstr ""
-#~ "(Du kan ändra det tidsintervall (i dagar) med vilket denna varning "
-#~ "visas<br> med hjälp av inställningen 'pluginmanager.warntime'.)"
-
-#~ msgid "Please report a ticket at {0}"
-#~ msgstr "Lämna in en rapport på {0}"
-
-#~ msgid "Be sure to include the following information:"
-#~ msgstr "Följande information måste finnas med:"
-
-#~ msgid "Include your steps to get to the error (as detailed as possible)!"
-#~ msgstr ""
-#~ "Berätta de steg du genomförde för att nå fram till felet (så detaljerat "
-#~ "som möjligt)!"
-
-#~ msgid "Edit Properties"
-#~ msgstr "Redigera egenskaper"
-
-#~ msgid "GPS unit timezone (difference to photo)"
-#~ msgstr "Tidszon för GPS-enhet (skillnad mot foto)"
-
-#~ msgid "Plugin already exists"
-#~ msgstr "Insticksmodulen finns redan"
-
-#~ msgid "Only two nodes allowed"
-#~ msgstr "Enbart två noder kan vara valda"
-
-#~ msgid "Only one node selected"
-#~ msgstr "Enbart en nod vald"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Välj sträckor som nästan har räta vinklar att räta upp."
-
-#~ msgid "Really mark this issue as ''done''?"
-#~ msgstr ""
-#~ "Vill du verkligen sätta status för detta problemfall som \"slutförd\"?"
-
-#~ msgid "Import TCX file as GPS track"
-#~ msgstr "Importera TCX-fil som GPS-spår"
-
-#~ msgid "Import TCX File..."
-#~ msgstr "Importera TCX-fil..."
-
-#~ msgid "AgPifoJ - Geotagged pictures"
-#~ msgstr "AgPifoJ - Geotaggade bilder"
-
-#~ msgid "Open images with AgPifoJ..."
-#~ msgstr "Öppna bilder med AgPifoJ..."
-
-#~ msgid ""
-#~ "<html>I can take a picture of my GPS receiver.<br>Can this help?</html>"
-#~ msgstr ""
-#~ "<html>Jag kan ta en bild av min GPS-mottagare.<br>Kan detta vara till "
-#~ "nytta?</html>"
-
-#~ msgid "Metacarta Map Rectifier image id"
-#~ msgstr "Id för Metacartas korrigerade kartbild"
-
-#~ msgid "rectifier id={0}"
-#~ msgstr "korrigeringsid={0}"
-
-#~ msgid "Please select the row to copy."
-#~ msgstr "Välj vilken rad du vill kopiera."
-
-#~ msgid "Oberpfalz Geofabrik.de"
-#~ msgstr "Oberpfalz Geofabrik.de"
-
-#~ msgid "YAHOO (WebKit GTK)"
-#~ msgstr "YAHOO (WebKit GTK)"
-
-#~ msgid "Drawbridge"
-#~ msgstr "Klaffbro"
-
-#~ msgid "Found <nd> element in non-way."
-#~ msgstr "Hittade element av typen <nd> på icke-sträcka"
-
-#~ msgid "<nd> has zero ref"
-#~ msgstr "<nd> har nollreferens"
-
-#~ msgid "The base URL for the OSM server (REST API)"
-#~ msgstr "Bas-URL för OSM-servern (REST API)"
-
-#~ msgid "Cannot read place search results from server"
-#~ msgstr "Kan inte läsa sökresultat för plats från servern"
-
-#~ msgid "hikingmap"
-#~ msgstr "vandringskarta"
-
-#~ msgid "citymap"
-#~ msgstr "stadskarta"
-
-#~ msgid "map"
-#~ msgstr "karta"
-
-#~ msgid "bicyclemap"
-#~ msgstr "cykelkarta"
-
-#~ msgid "Use preset ''{0}'' of group ''{1}''"
-#~ msgstr "Använd snabbvalet ''{0}'' i gruppen ''{1}''"
-
-#~ msgid ""
-#~ "Try updating to the newest version of JOSM and all plugins before "
-#~ "reporting a bug."
-#~ msgstr ""
-#~ "Innan du rapporterar in ett fel, försök först att uppdatera till den "
-#~ "nyaste versionen av JOSM och alla insticksmoduler."
-
-#~ msgid "NullPointerException, possibly some missing tags."
-#~ msgstr "NullPointerException, Det saknas förmodligen några taggar."
-
-#~ msgid "Found <member> element in non-relation."
-#~ msgstr "Fann <member>-tagg utanför relation."
-
-#~ msgid "Ill-formed node id"
-#~ msgstr "Felformaterad nod-id"
-
-#~ msgid ""
-#~ "The sources (URL or filename) of tagging preset definition files. See "
-#~ "http://josm.openstreetmap.de/wiki/TaggingPresets for help."
-#~ msgstr ""
-#~ "Källorna (URL eller filnamn) till de filer i vilka snabbval för taggning "
-#~ "definieras. Se http://josm.openstreetmap.de/wiki/TaggingPresets för mer "
-#~ "information."
-
-#~ msgid "Could not read from URL: \"{0}\""
-#~ msgstr "Kunde inte läsa från URL:en: \"{0}\""
-
-#~ msgid "Parsing error in URL: \"{0}\""
-#~ msgstr "Inläsningsfel på URL:en: \"{0}\""
 
 #~ msgid "Download Rectified Image from Metacarta's Map Rectifier WMS"
@@ -30311,7 +30951,4 @@
 #~ msgstr "Om vald så är dina spår öppna för allmänheten på openstreetmap.org"
 
-#~ msgid "Public"
-#~ msgstr "Publik"
-
 #~ msgid ""
 #~ "IMPORTANT : data positioned far away from\n"
@@ -30389,4 +31026,25 @@
 #~ msgstr "Ogiltig kartprojektion"
 
+#~ msgid "Edit Track of grade 1"
+#~ msgstr "Redigera en bruksväg klass 1"
+
+#~ msgid "Edit Track of grade 2"
+#~ msgstr "Redigera en bruksväg klass 2"
+
+#~ msgid "Edit Track of grade 3"
+#~ msgstr "Redigera en bruksväg klass 3"
+
+#~ msgid "Edit Track of grade 4"
+#~ msgstr "Redigera en bruksväg klass 4"
+
+#~ msgid "Edit Track of grade 5"
+#~ msgstr "Redigera en bruksväg klass 5"
+
+#~ msgid "Edit Demanding Alpine Hiking"
+#~ msgstr "Redigera en krävande fjällvandringsled"
+
+#~ msgid "Edit Difficult Alpine Hiking"
+#~ msgstr "Redigera en svår fjällvandringsled"
+
 #~ msgid "Edit Drawbridge"
 #~ msgstr "Redigera en klaffbro"
@@ -30407,7 +31065,4 @@
 #~ msgid "Default Values"
 #~ msgstr "Standardinställningar"
-
-#~ msgid "Interpolation"
-#~ msgstr "Interpolering"
 
 #~ msgid ""
@@ -30540,4 +31195,7 @@
 #~ "<br><br>Felmeddelandet är:<br>{0}</html>"
 
+#~ msgid "Conflicts in data"
+#~ msgstr "Datakonflikter"
+
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
@@ -30587,10 +31245,22 @@
 #~ "\"{1}\">ditt språk</A>."
 
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "parametern ''{0}'' får inte vara null"
+
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr "förväntade instans av OsmDataLayer eller GpxLayer. Erhöll \"{0}\"."
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "oförväntat returvärde. Erhöll {0}"
 
+#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "Parameter {0} > 0 krävs. Erhöll {1}."
+
 #~ msgid "There's no primitive with version {0} in this history."
 #~ msgstr "Det finns inget primitiv med version {0} i denna historik"
 
+#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
+#~ msgstr "parameter \"{0}\" förväntades inom området 0...{1}, erhöll {2}"
+
 #~ msgid "No earliest version found. History is empty."
 #~ msgstr "ingen tidigaste version funnen. Historiken är tom."
@@ -30601,2 +31271,8 @@
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Kunde inte öppna \"{0}\""
+
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "Parametern \"{0}\" får inte vara null"
+
+#~ msgid "Id > 0 required, got {0}"
+#~ msgstr "Id > 0 krävs, har {0}"
Index: applications/editors/josm/i18n/po/tr.po
===================================================================
--- applications/editors/josm/i18n/po/tr.po	(revision 19689)
+++ applications/editors/josm/i18n/po/tr.po	(revision 19698)
@@ -10,6 +10,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 23:20-0500\n"
-"PO-Revision-Date: 2010-01-18 13:41-0500\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-23 21:38+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\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-01-13 18:26+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -72,11 +72,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -97,4 +97,6 @@
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
 msgstr ""
+"\"downloadgps\" parametresi dosya isimleri ve dosya URLleri kabul "
+"etmemektedir."
 
 #: ../core/src/org/openstreetmap/josm/Main.java:497
@@ -237,5 +239,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -249,13 +251,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -264,5 +266,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -280,13 +285,13 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:67
 msgid "Please select the target layer."
-msgstr ""
+msgstr "Lütfen hedef katmanı seçin"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:71
 msgid "Select target layer"
-msgstr ""
+msgstr "Hedef katmanı seçin"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "Birleştir"
@@ -315,5 +320,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -380,9 +385,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -390,5 +395,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "OK"
@@ -439,6 +446,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -456,5 +463,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -463,11 +470,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -504,5 +511,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "çakışma"
@@ -514,9 +521,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37
 msgid "previous"
-msgstr ""
+msgstr "önceki"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38
 msgid "next"
-msgstr ""
+msgstr "sonraki"
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:54
@@ -635,14 +642,14 @@
 msgstr "Lütfen birleştirmek için en az iki yol seçiniz."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "Kopyala"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "Seçili objeleri yapıştır alanına (buffer) kopyala."
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "Lütfen kopyalama için seçim yapınız"
@@ -675,8 +682,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -685,5 +692,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -740,14 +747,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "Dışalım işlemi esnasında {0} çakışma oldu."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "İndirirken çakışmalar oldu"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -768,4 +776,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -775,4 +785,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "Kopyala ve Yapştır ile seçimi çiftle."
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "Çift Yol"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Make a duplicate of the currently selected layer."
+msgstr "Seçili üyeyi yukarı taşı"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
+#, java-format
+msgid "Layer: {0}"
+msgstr ""
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, java-format
+msgid "Copy of {0}"
+msgstr "{0} kadar yakınlaştır"
+
+#. Translators: "Copy {number} of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:46
+#, java-format
+msgid "Copy {1} of {0}"
+msgstr ""
 
 #. <button label="Info" hotkey="I">
@@ -863,9 +901,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 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] "Seçili yol seçili kavşakları içermiyor."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -984,5 +1022,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "URL"
@@ -1132,5 +1170,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr ""
 
@@ -1144,8 +1182,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "Dosyaları açıyor"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1168,7 +1207,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:70
-#, fuzzy
 msgid "Select if the data should be downloaded into a new layer"
-msgstr "Verinin indirileceği URL'yi girin:"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenLocationAction.java:77
@@ -1202,7 +1240,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1216,5 +1254,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "Noktaları taşı, açılar 90 veya 270 derece olsun"
 
@@ -1248,4 +1287,8 @@
 "undesirable results when doing rectangular alignments.<br>Change your "
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+msgid "Selection must consist only of ways and nodes."
 msgstr ""
 
@@ -1262,4 +1305,15 @@
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr "Ortogonal yapmak için uygun açılı yollar seçiniz."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1366,18 +1420,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1402,12 +1456,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "Hata"
@@ -1539,5 +1594,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1729,8 +1784,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:394
-#, fuzzy, java-format
+#, java-format
 msgid "Dupe {0} node into {1} nodes"
 msgid_plural "Dupe {0} nodes into {1} nodes"
-msgstr[0] "{0} kavşalarını {1} kavşakları üzerine getir"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1774,5 +1830,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr "Veriyi indir"
@@ -2191,6 +2247,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2268,7 +2324,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
-#, fuzzy
 msgid "<not>"
-msgstr "kuzey"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
@@ -2310,5 +2365,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "Objeleri ara."
@@ -2490,5 +2545,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "Arama"
@@ -2528,25 +2583,22 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "CS"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
-msgstr "CI"
+msgstr ""
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
-msgstr "RX"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2559,9 +2611,9 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2694,8 +2746,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "{0} Objeyi Değiştir"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2745,12 +2798,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "Kaldır \"{0}\" için {1} {2}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "Ayarla {0}={1} için {2} {3}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2808,17 +2861,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "Silme Modu"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "Sil"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "İlişkiler: {0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2898,8 +2951,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "{0} Objeyi Değiştir"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -2951,4 +3005,5 @@
 msgid_plural "Undelete {0} primitives"
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
@@ -2963,7 +3018,7 @@
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "Gerçekten seçili kısmı ilişkiden silmek istiyormusun {0}?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3210,5 +3265,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3216,5 +3271,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3222,5 +3277,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3228,5 +3283,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3305,15 +3360,13 @@
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "CS"
+msgstr ""
 
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
-#, fuzzy
 msgctxt "filter"
 msgid "I"
-msgstr "CI"
+msgstr ""
 
 #. column header: filter mode
@@ -3326,8 +3379,7 @@
 #. filter mode: replace
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210
-#, fuzzy
 msgctxt "filter"
 msgid "R"
-msgstr "RX"
+msgstr ""
 
 #. filter mode: add
@@ -3349,19 +3401,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3370,5 +3422,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3376,5 +3428,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3452,7 +3504,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:327
-#, fuzzy
 msgid "The \"to\" way does not start or end at a \"via\" node."
-msgstr "Seçili yol seçili kavşakları içermiyor."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java:355
@@ -3498,6 +3549,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3506,5 +3557,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3514,7 +3565,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3535,5 +3586,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "arkaplan"
@@ -3677,6 +3728,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3684,37 +3735,38 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "eksik"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "Karayolu"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "demiryolu"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "suyolu"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "arazi kullanımı"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3722,10 +3774,10 @@
 msgstr[0] "{0} Kavşak"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3733,5 +3785,5 @@
 msgstr[0] "{0} üye"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3768,6 +3820,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "Çelişki"
@@ -3778,7 +3830,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-#, fuzzy
-msgid "Authorization Failed"
-msgstr "Bağlantı hatası."
+msgid "Authorisation Failed"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
@@ -3982,5 +4033,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "Ayarlar Okunuyor"
@@ -4021,5 +4071,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4030,5 +4080,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "Düzenle"
@@ -4099,29 +4149,29 @@
 msgstr "ölçek"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "Fare imleci üzerindeki coğrafi boylam."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The name of the object at the mouse pointer."
 msgstr "Fare imleci üzerindeki objenin adı."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "Fare imleci üzerindeki coğrafi enlem."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 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:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "Segment çizildi."
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 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:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4129,9 +4179,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(obje yok)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4291,8 +4341,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "Etiket çakışmalarını düzelt"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
@@ -4301,4 +4352,5 @@
 msgid_plural "{0} pending tag conflicts to be resolved"
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
@@ -4353,16 +4405,16 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, java-format
 msgid "List in role {0} is currently not participating in a compare pair."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4558,8 +4610,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr "Noktaları en eskisiyle birleştir"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4593,4 +4649,5 @@
 "server.<br><br>Do you want to undelete these nodes too?"
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
@@ -4607,4 +4664,5 @@
 "deleted on the server.<br><br>Do you want to undelete these too?"
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
@@ -4705,5 +4763,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr ""
@@ -4749,5 +4807,10 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr ""
@@ -4877,10 +4940,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "boş"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "hepsi"
@@ -4910,7 +4973,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:101
-#, fuzzy, java-format
+#, java-format
 msgid "Tag collection does not include the selected value ''{0}''."
-msgstr "Seçili yol seçili kavşakları içermiyor."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:136
@@ -4960,7 +5023,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -4969,6 +5032,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5147,10 +5210,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5170,18 +5233,18 @@
 msgstr "Komut Yığını: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "Çözümle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr "Seçili nesneler için birleştime penceresi aç."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5213,8 +5276,9 @@
 msgid ""
 "<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions won't be applied unless all differences<br>are "
-"resolved.Click <strong>{0}</strong> to close anyway."
-"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<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 ""
 
@@ -5237,5 +5301,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5244,5 +5308,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5322,43 +5386,48 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "Tabakalar"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 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:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "Göster/Sakla"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "Çift Yol"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 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:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "Seçili tabakayı bir satır aşağı taşı."
@@ -5372,6 +5441,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "İlişkiler"
@@ -5381,69 +5450,69 @@
 msgstr "İlişkilerin listesini göster."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "İlişkiler: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "Seçili ilişki için bir editör aç."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "Seçili ilişkiyi sil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "Yeni ilişki oluştur"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "Güncel Seçim"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "Seçim listesi penceresini aç."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "Seçili eleman(lara) yakınlaş"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "Seçime yakınlaş"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, java-format
 msgid "Sel.: Rel.:{0} / Ways:{1} / Nodes:{2}"
 msgstr "Seçim.: İlişki.:{0} / Yollar:{1} / Kavşaklar:{2}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5451,5 +5520,5 @@
 msgstr "Seçim"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5712,4 +5781,5 @@
 "''{0}''.</html>"
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331
@@ -5799,8 +5869,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -5872,4 +5940,7 @@
 #. <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 />
@@ -5948,6 +6019,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -5989,6 +6061,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6457,152 +6531,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "İsim"
@@ -6985,5 +7061,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<farklı>"
@@ -7036,55 +7112,55 @@
 msgstr "Özellik Ekle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "Özellik: {0} / Üyelik: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "Özellik / Üyelik"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "İlişkiyi değiştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "Gerçekten seçili kısmı ilişkiden silmek istiyormusun {0}?"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "Seçili anahtarı her objeden sil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "Özelliği Sil"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "Her obje için yeni bir anahtar/değer çifti ekleyiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "Seçili anahtarın değerini her obje için düzenle"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7123,4 +7199,5 @@
 msgid_plural "Conflicts in data"
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:345
@@ -7403,4 +7480,5 @@
 msgid_plural "You are setting an empty role on {0} primitives."
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
@@ -7409,7 +7487,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
-#, fuzzy
 msgid "Do you really want to apply the new role?"
-msgstr "Buna izin veriyormusunuz?"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
@@ -7525,47 +7602,46 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "Sık Kullanılanlar"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:152
 msgid "<html>There is currently no download area selected.</html>"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../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:187
+#: ../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:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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:212
+#: ../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:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr ""
@@ -7686,18 +7762,18 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -7708,34 +7784,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:109
 msgid "Enter a place name to search for:"
 msgstr "Aranacak yerin adını giriniz:"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:111
+#: ../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:147
+#: ../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:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "Boş göstergeç(Pointer) hatası, bazı etiketler eksik olmalı."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr ""
@@ -7746,7 +7822,9 @@
 #. 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" />
@@ -7755,10 +7833,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "Tip"
@@ -7767,5 +7846,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -7777,17 +7856,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "bilinmeyen"
@@ -8132,5 +8210,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr ""
@@ -8494,4 +8572,5 @@
 "changes.<br>Layers with non-writable files:</html>"
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
@@ -8549,4 +8628,5 @@
 "cancelled or have failed.</html>"
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500
@@ -8569,9 +8649,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8581,7 +8661,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -8593,16 +8673,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "Tabaka"
@@ -9015,68 +9095,68 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "gps noktası"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "Çizimi özelleştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../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:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "Renkleri Ayarla"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "Varsayılan"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "Renk seç"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr "işaretli noktalardan imleçler"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "{0} isim verilen izler"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "Sesi içeri al"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9086,23 +9166,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave Audio files (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "{0} daki ses imleçleri"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "Görüntüleri içeri al"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9112,5 +9192,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9118,5 +9198,5 @@
 msgstr "İsim: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9124,5 +9204,5 @@
 msgstr "Tanım: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9132,23 +9212,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "Uzunluk: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9156,5 +9236,5 @@
 msgstr[0] "{0} rut, "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9162,10 +9242,10 @@
 msgstr[0] "{0} yol noktaları"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "Bilgi tabakasına çevir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9175,43 +9255,43 @@
 "yüklemek isterseniz buraya bakınız:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "Çevrildiği yer: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "OSM den bu izi indir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "Bunun içindeki herşeyi indir:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} metre"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "Her istek için max. alan:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} km2"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9222,9 +9302,9 @@
 "istiyor musunuz?</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 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:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9232,5 +9312,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9239,23 +9319,23 @@
 "Bazı çok uzak yol noktaları, zaman hassiyetine uymadığı için çıkartıldı."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "indirilen alanın dışında"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9264,5 +9344,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9276,5 +9356,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9287,11 +9367,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9300,32 +9380,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} şunları içerir:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "GPX tabakasına çevir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9368,28 +9448,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "GPS Noktaları"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX Dosyaları (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "{0} Dosyası \"{1}\" ismi ile yüklendi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, 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:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "Okunamadı \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9401,34 +9480,34 @@
 "seçiniz<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr "Fotoğraf zamanı (exif den):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 msgid "Gps time (read from the above photo): "
 msgstr "Gps zamanı (fotoğraftan okundu): "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [gg/aa/yyyy sa:dk:sn]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr "Şu zaman dilimindeyim: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "Tarih Yok"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr "Başka bir fotoğraf aç"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 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:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9438,64 +9517,64 @@
 "Lütfen istenen formatı kullanın"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "Geçersiz Tarih"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr "<GPX izi yüklenmedi>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr "GPX izi: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr "Başka GPX izi aç"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr "Zamandilimi: "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr "Offset:"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9503,46 +9582,47 @@
 "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
 msgstr[0] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr "imaj ile GPX izini ilişkilendir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr "Geçersiz zaman dilimi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr "Geçersiz offset"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9551,5 +9631,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9557,41 +9637,39 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 msgid "The selected photos do not contain time information."
-msgstr "Seçili yol seçili kavşakları içermiyor."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
 "one."
-msgstr "Seçili yol seçili kavşakları içermiyor."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr "GPX izi seçmelisiniz"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr "seçili GPX izi yok"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9602,5 +9680,5 @@
 "İstenen format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9611,73 +9689,75 @@
 "İstenen format: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "EXIF den GPS verisi çıkartılıyor"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr "klasör arama başladı"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "Fotoğraflar okunuyor..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "{0} Okunuyor..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, 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:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "Klasör aranıyor {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, 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:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, 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:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "Geotagged Görüntüler"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr "GPX e göre ilişkilendir"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "Bilgi yüklenemedi."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
+#, java-format
 msgid "{0} was found to be GPS tagged."
 msgid_plural "{0} were found to be GPS tagged."
-msgstr[0] "{0} gps için etiketlenecek bulundu."
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:585
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -9686,5 +9766,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -9781,10 +9861,10 @@
 msgstr "gps imleçi"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../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:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -9792,29 +9872,29 @@
 msgstr[0] "{0} {1} imleçten oluşur"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "Sesi Eşle"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 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:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:249
 #, java-format
 msgid "Audio synchronized at point {0}."
 msgstr "Ses {0} noktasında eşlendi."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 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:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -9822,17 +9902,17 @@
 msgstr "Sesi işaretlemek istediğinizde çalan kaydı durdurmanız gerekir."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 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:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "Göster/Sakla Metin/İkon"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 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:171
+#: ../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 "
@@ -9840,5 +9920,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -9848,5 +9928,5 @@
 "sürükleyiniz."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "Yeni ses imleci oluşturulamadı."
@@ -9872,5 +9952,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
 #, java-format
 msgid ""
@@ -9878,5 +9958,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
 #, java-format
 msgid ""
@@ -9928,8 +10008,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize URL:"
-msgstr "yazar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10019,8 +10097,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize now"
-msgstr "yazar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10079,7 +10155,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
-#, fuzzy
 msgid "OAuth authorization failed"
-msgstr "Bağlantı hatası."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
@@ -10159,8 +10234,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
-#| msgid "Please select at least four nodes."
 msgid "Please select an authorization procedure: "
-msgstr "En azından dört nokta seç."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10170,8 +10243,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
-#, fuzzy
-#| msgid "Close dialog and cancel downloading"
 msgid "Close the dialog and cancel authorization"
-msgstr "Pencereyi kapat ve indirmeyi iptal et"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
@@ -10484,5 +10555,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "Editlemek için bir satır seçiniz."
@@ -10496,5 +10567,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10636,9 +10707,4 @@
 msgstr "Boya Stili {0}: {1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr ""
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -10668,6 +10734,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr ""
@@ -10706,8 +10772,8 @@
 msgstr ""
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "Araba"
@@ -10729,13 +10795,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "Bisiklet"
@@ -10768,12 +10834,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "Ayak"
@@ -10825,11 +10891,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:104
-#, fuzzy
 msgid ""
 "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
 "draw all lines."
 msgstr ""
-"Çizgilerin çizilmesi için maximum uzunluk (metre) . Herşeyin çizilmesi için "
-"''-1'' yap."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:106
@@ -11116,5 +11179,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
-#, fuzzy
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11130,8 +11192,4 @@
 "keyboard...</p>"
 msgstr ""
-"<p>Kısayollar konusunda dikkat edilmesi gereken konu ise kısayol "
-"tanımlamasındaJava nın tanıdığı klavyeler esas alınmalıdır. Farklı klavye "
-"tiplerinde yapılacak  kısayol atamaları gerçekleşmeye bilir veya program "
-"tarafında çakışma olarak algılanabilir.</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
@@ -11748,5 +11806,12 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -11754,18 +11819,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "Seçilebilen Özellikler:"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -11776,16 +11841,16 @@
 msgstr "Etiketteki özellikler okunamadı: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "İşleme Hatası {0}: "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -11793,18 +11858,17 @@
 msgstr[0] "{0} Objeyi Değiştir"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "Özellikleri Değiştir"
@@ -12080,6 +12144,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12104,9 +12168,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "Ayrıştırma hatası: gpx dökümanı için geçersiz yapı."
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12122,7 +12186,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
-#, fuzzy
 msgid "Looking for image files"
-msgstr "Kıyı şeridi aranıyor..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
@@ -12130,7 +12193,13 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
 msgstr ""
 
@@ -12202,5 +12271,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "İçeri alınan koordinatlar: "
@@ -12301,8 +12370,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "{0} Objeyi Değiştir"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -12834,4 +12904,5 @@
 msgid_plural "({0}/{1}) Uploading {2} objects..."
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
@@ -12936,4 +13007,5 @@
 "are:"
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13005,4 +13077,5 @@
 "them manually."
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:567
@@ -13197,5 +13270,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13203,8 +13275,4 @@
 "file a bug report."
 msgstr ""
-"Beklenmedik bir hata oluştu.\n"
-"\n"
-"Bu bir kodlama hatasıdır. Eğer en son versiyonu kullanıyorsanız, lütfen "
-"hatayı bildiriniz"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13296,6 +13364,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -13411,6 +13479,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13419,5 +13487,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -13565,4 +13633,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr ""
@@ -13653,5 +13722,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr "Adres İnterpolasyon"
@@ -14230,5 +14299,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr ""
@@ -14385,21 +14454,21 @@
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr ""
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr ""
@@ -14431,9 +14500,9 @@
 msgstr "Çiftli yol oluştur"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr ""
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr ""
@@ -14448,13 +14517,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr "Yolu GPX tabakasından içeri al"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr "Var olan yolu iptal et"
@@ -14463,6 +14532,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr "GPX veri tabaksı bulunamadı."
@@ -14690,17 +14759,17 @@
 msgstr "Görüntü kümesini yeni bir tabaka olarak kaydet."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:69
 msgid "Direction index '{0}' not found"
 msgstr "Yön indexi'{0}' bulunamadı"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:109
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:100
 msgid "The starting location was not within the bbox"
 msgstr "Başlangıç noktası seçim alanı içinde değil"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:105
 msgid "Looking for shoreline..."
 msgstr "Kıyı şeridi aranıyor..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -14744,42 +14813,41 @@
 msgstr "Çift noktalar kaldırılıyor..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:287
 msgid "Lakewalker trace"
 msgstr "Gölyürüyüşü takip ediliyor"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "doğu"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "kuzeydoğu"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "kuzey"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "kuzeybat"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "batı"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "güneybatı"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "güney"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "güneydoğu"
@@ -14835,6 +14903,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -14843,73 +14911,73 @@
 msgstr "su"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "Kıyı çizgisi"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "yer"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:42
 msgid "Maximum number of segments per way"
 msgstr "Her yol için max segment sayısı"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:43
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:44
 msgid "Maximum number of nodes in initial trace"
 msgstr "İlk iz için max nokta sayısı"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:45
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:46
 msgid "Maximum gray value to count as water (0-255)"
 msgstr "Max gri seviyesi, su için (0-255)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:47
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:48
 msgid "Line simplification accuracy (degrees)"
 msgstr "çizgi basitleştirme doğruluğu (derece)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:49
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:50
 msgid "Resolution of Landsat tiles (pixels per degree)"
 msgstr "Landsat mozaik çözünürlüğü (derece başına pixel)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:51
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:52
 msgid "Size of Landsat tiles (pixels)"
 msgstr "Landsat mozaik boyutu (pixel)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:53
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:54
 msgid "Shift all traces to east (degrees)"
 msgstr "Bütün izleri doğuya taşı (derece)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:55
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:56
 msgid "Shift all traces to north (degrees)"
 msgstr "Bütün izleri kuzaye taşı (derece)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:57
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:58
 msgid "Direction to search for land"
 msgstr "Karaya doğru yön araması"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:59
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:60
 msgid "Tag ways as"
 msgstr "Yolları şu şekilde etiketle"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:61
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:62
 msgid "WMS Layer"
 msgstr "WMS Tabakası"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:63
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:64
 msgid "Maximum cache size (MB)"
 msgstr "Max. Hafıza Boyutu (MB)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:65
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:66
 msgid "Maximum cache age (days)"
 msgstr "Max. Hafızada tutma (gün)"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:67
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:68
 msgid "Source text"
 msgstr "Kaynak Metin"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:70
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
 msgid "Maximum number of segments allowed in each generated way. Default 250."
 msgstr "Oluşturulan yol için max. segment sayısı. Varsayılan 250."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14919,5 +14987,5 @@
 "Varsayılan 50000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -14927,5 +14995,5 @@
 "arasıVarsayılan:90."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14935,5 +15003,5 @@
 "değerler çok ve hassas nokta oluşturur. Varsayılan 0.0003."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
 msgid ""
 "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
@@ -14942,53 +15010,53 @@
 "Varsayılan:4000"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
 msgid "Size of one landsat tile, measured in pixels. Default 2000."
 msgstr "Landsat mozaik boyutu. Varsayılan 2000."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:76
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
 msgid "Offset all points in East direction (degrees). Default 0."
 msgstr "Bütün noktaları doğuya hizala (derece). Varsayılan 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:77
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
 msgid "Offset all points in North direction (degrees). Default 0."
 msgstr "Bütün noktaları kuzeye hizala (derece). Varsayılan 0."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:78
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
 msgid "Direction to search for land. Default east."
 msgstr "Yer aramak için yön. Varsayılan Doğu."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:79
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
 msgid "Tag ways as water, coastline, land or nothing. Default is water."
 msgstr "Yolu su, sahilşeridi,kara veya hiçbişi olarak etiketle. Varsayılan Su."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:80
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
 msgid "Which WMS layer to use for tracing against. Default is IR1."
 msgstr "Hangi WMS tabaksı iz takibi için kullanılsın."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:81
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
 msgid "Maximum size of each cache directory in bytes. Default is 300MB"
 msgstr "Çalışma hafızası boyutu, byte olarak. Varsayılan 300MB"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:82
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
 msgid "Maximum age of each cached file in days. Default is 100"
 msgstr "Çalışma alanında saklanılan dosyaların max yaşı (gün).Varsayılan 100"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:83
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:84
 msgid "Data source text. Default is Landsat."
 msgstr "Veri kaynak metni. Varsayılan landsat"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:85
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
 msgid "A plugin to trace water bodies on Landsat imagery."
 msgstr "Landsat imajı üzerinde su alanını tespit eden eklenti."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:86
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:87
 msgid "Lakewalker Plugin Preferences"
 msgstr "Gölyürüyüşü eklentisi tercihleri"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:48
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:50
 msgid "Downloading image tile..."
 msgstr "Görüntü mozaiği indiriliyor..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr "Görünüt alınamadı"
@@ -15012,5 +15080,5 @@
 msgstr "Bağlantı Hatası"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr ""
@@ -15041,5 +15109,5 @@
 msgstr "Yön"
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr "Canlı GPS tabakası"
@@ -15114,5 +15182,5 @@
 msgstr "Seçili iki kavşak arası açı"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr "Ölçüm tabakası"
@@ -15374,4 +15442,76 @@
 msgid "Firefox executable"
 msgstr "Firefox exe"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#, fuzzy
+msgid "Read error!"
+msgstr "Havuz"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "Yeni nokta için koordinat giriniz."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "Backup dosyalarını sakla"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "Hata"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "Girilen zaman ayrıştırılamadı."
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "''{0}'' dosyası yeniden adlandırılamadı"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "Backup dosyalarını sakla"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "Backup dosyalarını sakla"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "Üzerine Yaz"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+#, fuzzy
+msgid "Could not delete temporary file!"
+msgstr "Eleman tipi bulunamadı"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
@@ -15646,6 +15786,6 @@
 msgstr "Yakalanan veriyi her dakika otomatik sakla."
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -15767,72 +15907,128 @@
 msgstr "İlk olaraklar tercihlerden etiket kaynağını seçmelisiniz."
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+msgid "Terrace a house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+#, fuzzy
+msgid "Interpolation"
+msgstr "Adres İnterpolasyon"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "Sokaklar"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "Pafta Numarası"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "Nokta Numarası"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+msgid "Lowest housenumber of the terraced house"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "Yeni ilişki oluştur"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "Çiftli yol oluştur"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "Sokak Adı"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../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:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr ""
@@ -16066,5 +16262,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr "Çift Noktalar"
@@ -16074,5 +16270,5 @@
 msgstr "Bu test aynı lokasyonda birden fazla nokta varmı kontrol eder."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16083,9 +16279,9 @@
 "objeler onu kullanıyor olabilir. <br>Gerçekten silmek istiyormusunuz?"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr ""
@@ -16120,5 +16316,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr ""
@@ -16267,7 +16463,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr "Geçersiz etiket/anahtar kombinasyonu"
@@ -16275,60 +16471,60 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr "Renklendirme problemi"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "Anhatar ''{0}'' geçersiz ."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr "Boş değerli etiketler"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr "Geçersiz özellik anahtar"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr "Özellik anahtarında geçersiz -boşluk- karakteri"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr "Özellik anahtarı -boşluk- karakteri ile başlıyor veya bitiyor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr "Özellik anahtarı HTML bilgisi içeriyor"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr "Beni Düzelt!"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr "Özellik anahtarını kontrol et."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr ""
@@ -16336,22 +16532,22 @@
 "kontrol eder."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr "Karışık özellik kontrolu kullan."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr ""
 "Özellik anahtar ve etiketlerini karmaşık kuralları kullnarak kontrol et."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr "Etiket kontrolcusu kaynağı"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16360,86 +16556,86 @@
 "İmla kontrolu için kaynak dosya veya link veya etiket kontolcusu veri dosyası"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr "Listeye yeni bir kaynak ekle."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr "Seçili kaynağı kontrol et."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "Seçili kaynağı listeden sil."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "Veri kaynakları"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr "Özellik değerlerini kontrol et."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr "Önceden tanımlı değerleri kullanarak, özellik değerlerini kontrol et."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr "Beni Düzelt! leri kontrol et."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 msgid "Looks for nodes or ways with FIXME in any property value."
 msgstr "Beni Düzelt! değeri içeren yol veya noktalara bak."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr "Renklendirme notlarını kontro let."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr "Harita renklendirme hata durumunu kontrol et."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr "Varsayılan veri dosyasını kontrol et."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr "Varsayılan veri dosyasını kontrol et (önerilen)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr "Varsayılan imla dosyasını kontrol et."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr "Varsayılan imla dosyasını kontrol et (önerilen)."
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr "Özellikler Düzelt"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr "Eleman tipi bulunamadı"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr "Uyarı seviyesi bulunamadı"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "Hatalı söylem ''{0}''"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -16881,5 +17077,5 @@
 msgstr "WMS tabakası ({0}), görüntü seviyesi {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -16890,13 +17086,17 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+msgid "Download visible tiles"
+msgstr "Görünen mozaikleri indir"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
@@ -16905,50 +17105,46 @@
 "değiştirin"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
-msgid "Download visible tiles"
-msgstr "Görünen mozaikleri indir"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "Çözünürlüğü değiştir"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "WMS tabakasını dosyaya kaydet"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "WMS tabakasını dosyadan yükle"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, 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:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr "Dosya Format Hatası"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "Dosya Yüklemede Sorun"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -17203,6 +17399,13 @@
 msgstr ""
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17211,15 +17414,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr ""
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr ""
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17228,10 +17431,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr ""
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17240,15 +17443,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr ""
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr ""
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17258,10 +17461,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr ""
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17270,5 +17473,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17277,10 +17480,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr ""
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -17387,6 +17590,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -17394,6 +17606,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "Referans"
@@ -17410,5 +17623,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "Şeritler"
@@ -17430,10 +17643,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "Max. hız (km/sa)"
@@ -17477,14 +17690,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "TekYol"
@@ -17527,13 +17740,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -17571,13 +17784,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "Tunel"
@@ -17612,13 +17825,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "Kesen"
@@ -17653,13 +17866,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "toprak set"
@@ -17791,4 +18004,13 @@
 msgid "Edit Unclassified Road"
 msgstr "Sınıflandırılmamış yolu düzenle"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr ""
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -17806,15 +18028,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr ""
@@ -17826,5 +18048,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "yerleşim alanı"
@@ -17833,5 +18055,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "yerleşim sokağını düzenle"
@@ -17849,16 +18071,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "Yüzey"
@@ -17880,166 +18105,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr "kaldırım"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr "kaldırımsız"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "orman"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr "parke taşı"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "Çakıl"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "ot"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "kum"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr "toprak"
@@ -18047,5 +18279,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr "Canlı Sokak"
@@ -18054,5 +18286,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr "Living Street düzenle"
@@ -18060,5 +18292,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "Yaya Yolu"
@@ -18067,5 +18299,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "yaya yol sokağını düzenle"
@@ -18073,5 +18305,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr "Servis"
@@ -18080,5 +18312,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr "Servis yolu düzenle"
@@ -18088,18 +18320,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr ""
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr ""
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr ""
@@ -18107,5 +18339,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr "Park alanı"
@@ -18115,5 +18347,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr "Park alanı düzenle"
@@ -18121,5 +18353,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "yol (tipi bilinmiyor)"
@@ -18128,5 +18360,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "Tipi olmayan yolu düzenle"
@@ -18135,20 +18367,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "Yol kısıtlamaları"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "Yol kısıtlamalarını düzenle"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "ücret"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "Çıkış Yok"
@@ -18156,9 +18388,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 msgid "Access"
 msgstr "Erişim"
 
 #. 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"
@@ -18169,6 +18402,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18180,4 +18411,5 @@
 #. 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"
@@ -18196,141 +18428,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+msgid "yes"
+msgstr "Evet"
+
+#. 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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "özel"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+msgstr "atanmış"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:219
+msgid "destination"
+msgstr "varış"
+
+#. 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr "ihtiyari"
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr "tarımsal"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-msgid "yes"
-msgstr "Evet"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "özel"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-msgstr "atanmış"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "varış"
-
-#. 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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr "ihtiyari"
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr "tarımsal"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "hayır"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr "mallar"
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Ağır araç"
@@ -18345,10 +18585,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr "AT"
@@ -18364,10 +18604,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "Motosiklet"
@@ -18382,27 +18622,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr "otomobil"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr "Toplu taşıma araçları"
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr "Motorboat"
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "Boat"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "Min. Hız (km/h)"
@@ -18410,25 +18642,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "Max. ağırlık (ton)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "Döner Kavşak"
@@ -18439,5 +18671,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "Kavşak Düzenle"
@@ -18457,10 +18689,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "araçyolu"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr "otoyol_hat"
@@ -18482,10 +18714,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "ana_hat"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr "anayol_hat"
@@ -18507,10 +18739,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "birincil"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr "birincil_hat"
@@ -18532,5 +18764,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -18545,9 +18777,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "üçüncül"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr "sınıflandırılmamış"
@@ -18561,9 +18793,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "yerleşim_alanı"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr "canlı_sokak"
@@ -18593,10 +18825,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "servis"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr "otobüs_hattı"
@@ -18626,5 +18858,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -18636,10 +18868,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "Köprü Düzenle"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr ""
@@ -18647,19 +18879,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "Yollar"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "İnşaat"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "Otoyolda onarım var olarak düzenle"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "Kavşak"
@@ -18675,5 +18907,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "döner kavşak"
@@ -18681,5 +18913,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr "İz"
@@ -18688,40 +18920,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr "İz düzenle"
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "İz"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "Çakıl"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "Çakıl"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "Çakıl"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "Çakıl"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "Çakıl"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr ""
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -18729,5 +18955,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -18735,37 +18961,32 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr ""
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "Dağ gezisi"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
-msgstr "istenen dağ gezisi"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
-msgstr "Dağ Gezisi"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
-msgstr "istenen Dağ Gezisi"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
-msgstr "Zor Dağ Gezisi"
+msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "Yol"
@@ -18774,12 +18995,32 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "Yol düzenle"
 
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
+
 #: build/trans_presets.java:489
-#, fuzzy
 msgid "Wheelchairs"
-msgstr "tekerlekli sandalye"
+msgstr ""
 
 #: build/trans_presets.java:490
@@ -18795,7 +19036,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "At yolu düzenle"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -18808,7 +19048,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "Bisiklet yolu düzenle"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -18843,24 +19082,21 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "Ne olursa olsun: Birleştir"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "Yürüyüş Yolu Düzenle"
+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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Yürüyüş Yolu Düzenle"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr ""
@@ -18868,5 +19104,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "adımlar"
@@ -18876,5 +19112,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "Uçuş adımları düzenle"
@@ -18882,10 +19118,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr "Yol noktaları"
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "Otoyol Kavşağı"
@@ -18893,15 +19129,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "Otoyol Kavşağı birleştirme"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "Numara"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "Servis"
@@ -18909,5 +19145,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr "Sevis istasyonu düzenle"
@@ -18915,5 +19151,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -18946,17 +19183,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "Operator"
@@ -18965,5 +19202,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "Trafik ışıkları"
@@ -18973,5 +19210,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -18980,27 +19217,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr "kontrolsuz"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "ada"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr ""
@@ -19008,6 +19245,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr ""
@@ -19016,11 +19253,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -19028,30 +19265,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr "pelikan"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "Dur"
@@ -19059,5 +19296,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -19066,14 +19303,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr ""
@@ -19084,14 +19367,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr "Dönme Daire"
@@ -19101,26 +19384,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "şehir sınırı"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "şehir sınırı düzenle"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr "ikinci isim"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 msgid "Speed Camera"
 msgstr "hız kamerası"
 
 #. 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "Acil durum telefonu"
@@ -19128,5 +19413,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr ""
@@ -19134,5 +19419,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr ""
@@ -19140,11 +19425,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr "sığ geçit"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr "sığ geçit düzenle"
@@ -19152,5 +19444,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr "Dağ geçidi"
@@ -19158,5 +19450,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr "dağ geçidi düzenle"
@@ -19168,7 +19460,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "yükseklik"
@@ -19176,5 +19468,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "Bariyer"
@@ -19182,5 +19474,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr "direk-iskele"
@@ -19188,5 +19480,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr "direk-iskele düzenle"
@@ -19231,16 +19523,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "İzin verilen trafik:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr ""
@@ -19249,5 +19541,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr "Blok"
@@ -19255,5 +19547,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr "Hayvan Kapısı"
@@ -19261,10 +19553,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr "Hayvan Kapısı Düzenle"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr "otobüs geçidi"
@@ -19272,15 +19564,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr "Spikes"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "gişe"
@@ -19288,5 +19580,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "gişe  düzenle"
@@ -19294,10 +19586,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr "Sınır kontrol noktası"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr "Sınır kontrol noktası düzenle"
@@ -19307,5 +19599,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr "Çalı Çit"
@@ -19314,12 +19606,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:817 build/trans_presets.java:819
 msgid "Fence"
 msgstr "Çit"
 
-#. item "Barriers/Fence"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "Duvar"
@@ -19327,5 +19631,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "Şehir Duvarı"
@@ -19334,5 +19638,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr "istinat duvarı"
@@ -19344,15 +19648,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr "Giriş"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr "Giriş düzenle"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "Geçit"
@@ -19360,50 +19665,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr "Geçit Düzenle"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr "Kalkan geçit"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr "kalkan geçit düzenle"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr "Hampshire Geçidi"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr "Hampshire Geçidi Düzenle"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr "Hız engeli"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr "Hız engeli düzenle"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr "geçit"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr "geçit düzenle"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr "Stil"
@@ -19411,25 +19716,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr "Stil düzenle"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr "Çıkış Kapısı-asker"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr "Çıkış Kapısı-asker düzenle"
@@ -19440,11 +19745,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "Su"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "Spring"
@@ -19452,5 +19757,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "Spring Düzenle"
@@ -19458,5 +19763,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr "kanalizasyon"
@@ -19464,10 +19769,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr "kanalizasyon düzenle"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "dere"
@@ -19475,10 +19791,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "dere düzenle"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "Kanal"
@@ -19486,10 +19802,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "Kanal düzenle"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "nehir"
@@ -19499,5 +19815,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "nehir düzenle"
@@ -19505,15 +19821,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "Su Düzenle"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "Kara"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "Kara Düzenle"
@@ -19521,15 +19837,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr "havza"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr "havza kullanım düzenle"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr "Havuz"
@@ -19537,15 +19853,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr "Havuz Kullanımı Düzenle"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr "Kapalı Sarnıç"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr "Kapalı Sarnıç Düzenle"
@@ -19553,5 +19869,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "Nehirkenarı"
@@ -19560,10 +19876,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "Nehirkenarı Düzenle"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr "sulak alan"
@@ -19574,14 +19890,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr "sulak alan düzenle"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "bataklık"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr "kenef"
@@ -19595,35 +19911,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr "batak"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr "sazlık alan"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr "çolak alan"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr "gelgit alanı"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr "bataklık ormanı"
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr "Çamur"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr "Çamur Alan Düzenle"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "Sahil"
@@ -19631,20 +19947,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "Sahil Düzenle"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "Koy"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "koy Düzenle"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "Uçurum"
@@ -19652,10 +19968,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "Uçurum Düzenle"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "Sahil Çizgisi"
@@ -19663,5 +19979,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "Sahil Çizgisi Düzenle"
@@ -19669,5 +19985,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "feribot hat"
@@ -19675,5 +19991,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr "feribot hat düzenle"
@@ -19682,5 +19998,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr "Marina"
@@ -19688,10 +20004,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr "Marina düzenle"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "iskele"
@@ -19699,5 +20015,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr "iskele düzenle"
@@ -19705,5 +20021,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "Baraj"
@@ -19711,15 +20027,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "Baraj düzenle"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr "Su yolu noktası"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr "Lock Gate"
@@ -19728,5 +20044,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr "bent"
@@ -19734,20 +20050,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr "bent dünele"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "şelale"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "şelale düzenle"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr "dönüm noktası"
@@ -19756,15 +20072,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr "Marina"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr "Marina düzenle"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "Kemer"
@@ -19772,10 +20088,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "Kemer Düzenle"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr "Feribot Terminal"
@@ -19783,10 +20099,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr "Feribot Terminal düzenle"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr "Gemi Kızağı"
@@ -19796,20 +20112,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr "Gemi Kızağı Düzenle"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "Demiryolu"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "Demiryolu"
@@ -19817,5 +20133,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr "Demiryolu düzenle"
@@ -19824,139 +20140,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr "standard"
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr "saha"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr "yük boşaltma yeri"
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr "demiryolu hattı şube-kısa"
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr "demiryolu"
+
+#. 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:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+msgid "Voltage"
+msgstr "Voltaj"
+
+#. 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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr "Dar geçiş demiryolu"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr "Dar geçiş demiryolu düzenle"
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr "tek ray"
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr "tek ray düzenle"
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr "Korunmuş"
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr "Korunmuş demiryolu düzenle"
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr "Hafif Ray"
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr "Hafif Ray Düzenle"
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "Metro"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "Metro Düzenle"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "Tramvay"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr "Tramvay Düzenle"
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr "Otobüs Yolu"
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr "Otobüs Yolu Düzenle"
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "Kullanılmayan Demiryolu"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "Kullanılmayan Demiryolu Düzenle"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr "seçmeli tipler"
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr "saha"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr "yük boşaltma yeri"
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr "demiryolu hattı şube-kısa"
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr "Dar geçiş demiryolu"
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr "Dar geçiş demiryolu düzenle"
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr "tek ray"
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr "tek ray düzenle"
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr "Korunmuş"
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr "Korunmuş demiryolu düzenle"
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr "Hafif Ray"
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr "Hafif Ray Düzenle"
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "Metro"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "Metro Düzenle"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "Tramvay"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr "Tramvay Düzenle"
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr "Otobüs Yolu"
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr "Otobüs Yolu Düzenle"
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "Kullanılmayan Demiryolu"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "Kullanılmayan Demiryolu Düzenle"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "Terkedilmiş demiryolu düzenle"
@@ -19965,5 +20520,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr "hemzemin geçit"
@@ -19972,5 +20527,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr "geçit"
@@ -19980,5 +20535,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr ""
@@ -19986,5 +20541,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "döner levha"
@@ -19993,10 +20548,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr "havayolu"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "Teleski"
@@ -20004,10 +20566,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr "Teleski Düzenle"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr "Kayakçı Asansörü"
@@ -20015,10 +20577,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr "Kayakçı Asansörü Düzenle"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "Hava tramvayı"
@@ -20026,10 +20588,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "Hava tramvayı düzenle"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr ""
@@ -20037,10 +20599,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20048,12 +20610,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr ""
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "Yakıt"
@@ -20063,9 +20638,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "Yakıt düzenle"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20119,32 +20751,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr "Açılış saati"
@@ -20203,94 +20835,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20302,5 +21010,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20310,5 +21018,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "Park düzenle"
@@ -20319,25 +21027,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr "Referans Numarası"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "kat otoparkı"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "yüzey"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr "yer altı"
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr ""
@@ -20346,48 +21054,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "Ücret"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr "Özürlü Alanı"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "Yıkama"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "Yıkama düzenle"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "tamirci"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "tamirci düzenle"
@@ -20395,5 +21103,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "araç kiralam"
@@ -20402,10 +21110,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "araç kiralam düzenle"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr "Paylaşım Alanı"
@@ -20413,5 +21121,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr "Araç Paylaşım alanı düzenle"
@@ -20419,10 +21127,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "Bisiklet parkyeri düzenle"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr "kapasite"
@@ -20431,15 +21139,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "bisiklet kiralama düzenle"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "Toplu taşıma"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -20449,5 +21157,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -20455,5 +21163,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr "UIC-Referans"
@@ -20461,5 +21169,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr "Demiryolu sonu"
@@ -20467,5 +21175,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr "Son nokta düzenle"
@@ -20473,5 +21181,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "Tramvay durağı"
@@ -20480,5 +21188,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "tramvay durağı düzenle"
@@ -20486,5 +21194,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "Demiryolu platformu"
@@ -20493,5 +21201,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "Demiryolu platformu düzenle"
@@ -20503,5 +21211,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr "referans (iz numarası)"
@@ -20509,10 +21217,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr "Alan"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "Metro Girişi"
@@ -20521,10 +21229,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "Metro Girişi Düzenle"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr "tekerlekli sandalye"
@@ -20533,5 +21241,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "otogar"
@@ -20540,5 +21248,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "otogar düzenle"
@@ -20546,5 +21254,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "otobüs durağı"
@@ -20554,5 +21262,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "otobüs durağı düzenle"
@@ -20561,25 +21269,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr "Sığınak"
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "banket"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr "otobüs platformu"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr "otobüs platformu düzenle"
@@ -20587,5 +21296,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "Taksi"
@@ -20593,5 +21302,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "taksi istasyonu düzenle"
@@ -20599,32 +21308,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "Havaalanı"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr ""
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr "IATA"
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr "ICAO"
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+msgid "Beacon"
+msgstr "Fener"
+
+#. 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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr ""
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "Kalınacak Yerler"
@@ -20636,5 +21440,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -20643,15 +21447,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "Hotel Düzenle"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "Stars"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr "Motel"
@@ -20659,20 +21463,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr "Motel Düzenle"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr "Misafir Evi"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr "Misafir Evi Düzenle"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr "kulübe"
@@ -20680,10 +21484,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr "külübe düzenle"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr "Hostel"
@@ -20691,30 +21495,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr "Hostel Düzenle"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr "Dağcı Barakası"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr "Dağcı Barakası Düzenle"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr "Karavan Alanı"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr "Karavan Alanı Düzenle"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "Kamp Sitesi"
@@ -20722,10 +21526,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr "Kamp Sitesi Düzenle"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "Yüyecek+içecek"
@@ -20736,5 +21540,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -20742,5 +21546,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "Restorant Düzenle"
@@ -20748,5 +21552,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr "lokanta"
@@ -20754,61 +21558,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "italyan"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "çinli"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "yunan"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "alman"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "hint"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "yöresel"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "türk"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "asyalı"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "mexican"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "japanese"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -20816,9 +21632,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "Fast Food düzenle"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "Kafe"
@@ -20826,9 +21650,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "Cafe düzenle"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "Pub"
@@ -20836,18 +21660,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "Pub Düzenle"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr "Biergarten Düzenle"
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr ""
@@ -20855,9 +21679,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "GeceKlubu"
@@ -20865,24 +21689,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "GeceKulubu Düzenle"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "Turizm"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr "İlginç Yerler"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr "İlginç Yerler Düzenle"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "Müse"
@@ -20890,9 +21714,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "Müze Düzenle"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "Hayvanat Bahçesi"
@@ -20901,9 +21725,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "Hayvanat Bahçesi Düzenle"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "Seyir Yeri"
@@ -20911,24 +21735,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "Seyir Yeri Düzenle"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr "Seyir Kulesi"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "Lunapark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr "Lunapark Düzenle"
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "Sanatsal"
@@ -20936,5 +21760,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "Sanatsal Düzenle"
@@ -20942,19 +21766,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr ""
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "Harita"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr ""
@@ -20992,5 +21816,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -20998,28 +21822,28 @@
 msgstr "sokak"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr ""
@@ -21029,5 +21853,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr ""
@@ -21035,5 +21859,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr "gezme"
@@ -21041,6 +21865,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "Bisiklet"
@@ -21048,5 +21872,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr ""
@@ -21054,6 +21878,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "Kayak"
@@ -21061,5 +21885,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr ""
@@ -21067,46 +21891,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "tarih"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr "doğa"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr "vahşiyaşam"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr ""
@@ -21114,29 +21938,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr "Sığınak Düzenle"
@@ -21144,25 +21968,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr "Mangal Alanı"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "Piknik Alanı"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "Piknik Alanı Düzenle"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "Tarihi Alanlar"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "Kale"
@@ -21171,19 +21995,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "Kale Düzenle"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "Harabe"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "Harabe Düzenle"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "Arkeolojik Site"
@@ -21192,9 +22016,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "Arkeolojik Site Düzenle"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "Savaş Alanı"
@@ -21202,10 +22026,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "Savaş Alanı Düzenle"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr ""
@@ -21213,5 +22037,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -21219,15 +22043,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "Anıt"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "Anıt Düzenle"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "Abide"
@@ -21235,55 +22059,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "Abide Düzenle"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr "Yol Kenar Geçişi"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr "Yol Kenar Geçişi Düzenle"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr "Yolkenarı İbadetyeri"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr "Yolkenarı İbadetyeri Düzenle"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "Dinlenme Alanı"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "Su Parkı"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "Su Parkı Düzenle"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "Oyun Sahası"
@@ -21291,35 +22115,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "Oyun Sahası Düzenle"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "Balıkçılık"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "Balıkçılık Düzenle"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr "Spor Aktivite"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "Stadyum"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "Stadyum Düzenle"
@@ -21333,6 +22157,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "Spor Seç"
@@ -21724,6 +22548,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -21757,225 +22581,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr "çoğul"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "okçuluk"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr "atletik"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "avustralya_footbol"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "basebol"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "basketbol"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr "bowling"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr "çimen bowling"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "tırmanma"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr "cricket nets"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "bisiklet"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr "köpek yarışı"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr "at binicilik"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "futbol"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "jimnastik"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "hokey"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr "at_yarışı"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr "raket"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "atıcılık"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr "kaykay"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr "paten"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "kaymak"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "futbol"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "yüzmek"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "masa_tenisi"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "spor merkezi"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "spor merkezi düzenle"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr "atıcılık"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr "atıcılık düzenle"
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr "yarış pisti"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr "yarış pisti düzenle"
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "Golf Alanı"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "Golf Alanı Düzenle"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "Minyatür Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "Minyatür Golf Düzenle"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "Spor"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr "Çoğul"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr "Çoğul Düzenle"
@@ -22014,21 +22838,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "tip"
@@ -22067,203 +22891,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr "atıcılık"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "spor_merkezi"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "stadyum"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr "10pin"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr "10pin Düzenle"
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr "Atletik"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr "Atletik Düzenle"
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "okçuluk"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "okçuluk düzenle"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "tırmanma"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "tırmanma düzenle"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr "Kano Düzenle"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr "Bisiklet Düzenle"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "Köpek Yarışı"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr "Köpek Yarışı Düzenle"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr "binicilik"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr "binicilik düzenle"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr "At Yarışı"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr "At Yarışı Düzenle"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "jimnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr "jimnastik düzenle"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "Motor Sporlar"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr "Motor Sporları Düzenle"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr "patinaj"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr "patinaj düzenle"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr "kaykay"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr "kaykay düzenle"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "yüzme"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "yüzme düzenle"
@@ -22271,56 +23095,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr "Kayak Düzenle"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr ""
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "Atıcılık"
@@ -22328,182 +23148,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "Atıcılık Düzenle"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "Spor (Topla)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "Futbol"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr "Futbol Düzenle"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "Amerikan Futbolu"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr "Amerikan Futbolu Düzenle"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr "Avustralyan Futbol"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr "Avustralyan Futbol Düzenle"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr "Baseball Düzenle"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "Basketbol"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "Basketbol Düzenle"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr "Golf Düzenle"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "golf_alanı"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr "Boule Düzenle"
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr "Bowling"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr "Bowling Düzenle"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr "Kricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr "Kricket Düzenle"
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr "Cricket Nets Düzenle"
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr "Kroke"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr "kroke Düzelt"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "Hockey Düzenle"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr "Pelota Düzenle"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr "Raket"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr "Raket Düzenle"
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr "Rugby Düzenle"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "Masa Tenisi"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "Masa Tenisi Düzenle"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "Tennis Düzenle"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "Binalar"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "Bina"
@@ -22511,5 +23331,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "Kamu Binası"
@@ -22517,10 +23337,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "Kamu Binası Düzenle"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "belediye binası"
@@ -22528,10 +23348,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "belediye binası düzenle"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "Büyükelçilik"
@@ -22539,10 +23359,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "Büyükelçilik Düzenle"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "adliye sarayı"
@@ -22551,10 +23371,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "adliye sarayı düzenle"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "Hapishane"
@@ -22563,10 +23383,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "Hapishane Düzenle"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "Polis"
@@ -22576,10 +23396,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "Polis Düzenle"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "İtfaye İstasyonu"
@@ -22588,10 +23408,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "İtfaye İstasyonu Düzenle"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "Postane"
@@ -22599,5 +23419,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "Postane Düzenle"
@@ -22605,15 +23425,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "Anaokul"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "Anaokul Düzenle"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "Okul"
@@ -22621,10 +23441,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "okul düzenle"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "Universite"
@@ -22632,10 +23452,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "Universite Düzenle"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "kolej"
@@ -22643,5 +23463,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "kolej düzenle"
@@ -22649,5 +23469,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "Sinema"
@@ -22656,10 +23476,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "Sinema Düzenle"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "kütüphane"
@@ -22668,9 +23488,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "kütüphane düzenle"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "sanat merkezi"
@@ -22678,10 +23498,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "sanat merkezi düzenle"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "Tiyatro"
@@ -22690,10 +23510,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "Tiyatro Düzenle"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "Tapınak"
@@ -22703,5 +23523,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "Tapınak Düzenle"
@@ -22710,6 +23530,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "Din"
@@ -22718,66 +23538,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "budist"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "hristiyan"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "yahudi"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "müslüman"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr "Zerdüştlük"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr "mezhep"
@@ -22786,81 +23606,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr "anglikan"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "katholik"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr "protestan"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr "yahova_şahitleri"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "Adres"
@@ -22869,5 +23689,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "Adres Bilgileri Düzenle"
@@ -22875,5 +23695,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr "Ev no:"
@@ -22881,25 +23701,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr "Ev İsmi"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "Sokak Adı"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "Şehir Adı"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "Posta Kodu"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "Ülke Kodu"
@@ -22908,5 +23728,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr "Adres İnterpolasyon Düzenle"
@@ -22914,61 +23734,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr "Numara şeması"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "tek"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "çift"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr "İnsan Yapımı"
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "Tesis"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "Tesis Düzenle"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "Kule"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "Kule Düzenle"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr ""
@@ -22976,25 +23796,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "Su Kulesi"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "Su Kulesi Düzenle"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "Gazdeposu"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "Gazdeposu Düzenle"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "DenizFeneri"
@@ -23002,10 +23822,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "DenizFeneri Düzenle"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "Yeldeğerimeni"
@@ -23013,10 +23833,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "Yeldeğerimeni Düzenle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "Suboru Hattı"
@@ -23025,37 +23845,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "Suboru hattı Düzenle"
 
-#: build/trans_presets.java:2198
-msgid "oil"
-msgstr ""
-
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
 msgid "gas"
 msgstr "benzin"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr ""
+
+#: build/trans_presets.java:2353
+msgid "oil"
+msgstr ""
+
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "Kanalizasyon Plant"
@@ -23065,10 +23885,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "Kanalizasyon Plant Düzenle"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "Vinç"
@@ -23076,21 +23896,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "Vinç Düzenle"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr "Fener"
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr "Fener Düzenle"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "Poligon Noktası"
@@ -23098,10 +23913,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "Poligon Noktası Düzenle"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "Gözetim"
@@ -23109,11 +23924,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "Gözetim Kamera Düzenle"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "Güç Jeneratorü"
@@ -23123,35 +23950,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "Güç Jeneratorü Düzenle"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "rüzgar"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "hidro"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "fosil"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "nükleer"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "kömür"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr "güneş enerjisi"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr "Güç İstasyonu"
@@ -23160,10 +23987,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr "Güç İstasyonu Düzenle"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr "Alt Güç İstasyonu"
@@ -23172,5 +23999,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr "Alt Güç İstasyonu Düzenle"
@@ -23178,10 +24005,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr "çizgi referansı"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "Güç Kulesi"
@@ -23192,23 +24019,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "güç Kulesi Düzenle"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "Güç Hattı"
@@ -23217,79 +24044,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "Güç Hattı Düzenle"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr ""
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "Voltaj"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr "hoş mekan"
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "Tuvalet"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr "Not"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "Posta Kutusu"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "Telefon"
@@ -23298,5 +24120,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "Telefon Düzenle"
@@ -23304,5 +24126,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "Madeni Para"
@@ -23310,5 +24132,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr "Notlar"
@@ -23316,5 +24138,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronik cüzdan ve Para Değişim Kartları"
@@ -23322,5 +24144,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr "ATM kartı"
@@ -23328,15 +24150,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "Kredi Kartı"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "Telefon kart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "Geri Dönüşüm"
@@ -23345,5 +24167,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "Geri Dönüşüm İstasyonu"
@@ -23351,63 +24173,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "Piller"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "Çöp Tenekesi"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "Kıyafet"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "Cam"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "Kağıt"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "Hurda Metal"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+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:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr ""
@@ -23486,5 +24319,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -23494,31 +24327,31 @@
 msgstr "yeşil"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr "Av Standı"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr "Av Standı Düzenle"
@@ -23527,30 +24360,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "Yükseklik"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr "alçak"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr "yarım"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr "tam"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr "Sakla"
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr "Kilitle"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "Kaynak"
@@ -23559,10 +24392,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "Kaynak Düzenle"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "İçme Suyu"
@@ -23571,10 +24404,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "İçme Suyu Düzenle"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr "Bebek Yuvası"
@@ -23582,15 +24428,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr "Bebek Yuvası Düzenle"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "Dükkanlar"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr ""
@@ -23598,10 +24444,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "araçlı alışveriş düzenle"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr ""
@@ -23610,28 +24456,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "Bisiklet dükkanı düzenle"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "Supermarket Düzenle"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr "Bakkal"
@@ -23639,9 +24485,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr "Bakkal Düzenle"
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -23649,27 +24495,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr "Kiosk Düzenle"
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr ""
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr ""
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "Kahve Makinası"
@@ -23677,5 +24523,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "Kahve Makinası Düzenle"
@@ -23683,88 +24529,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "Ücretli Ürünler"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr "toplu_taşıma_bileti"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr "toplu_taşıma_hatları"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr "Park_bileti"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "yiyecek"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "içecek"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "tatlı"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "sigara"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "fotoğraf"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "hayvan_besini"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "gazeteler"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "oyuncuklar"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "pullar"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "SIM-kart"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr "telefon_kartı"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr "bilet"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "kondom"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr "tampon"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr "dışkı_poşeti"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr "hesap veya üyelik kartı"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "kasap"
@@ -23772,9 +24618,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "kasap düzenle"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "fırın"
@@ -23782,9 +24628,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "fırın düzenle"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr ""
@@ -23792,18 +24638,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr ""
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr ""
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr ""
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr ""
@@ -23811,54 +24657,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr ""
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr ""
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr ""
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr ""
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr ""
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr ""
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr ""
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr ""
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr ""
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr ""
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr ""
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr ""
@@ -23866,9 +24712,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr ""
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr ""
@@ -23876,9 +24722,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "kendin-al-market"
@@ -23886,54 +24732,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "kendin-al-market düzenle"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr ""
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr ""
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "berber"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "berber düzenle"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr ""
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr ""
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr ""
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr ""
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr ""
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr ""
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "Kuru Temizleme"
@@ -23941,9 +24787,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "Kuru Temizleme Düzenle"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "Çamaşırhane"
@@ -23951,9 +24797,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "Çamaşırhane Düzenle"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr "Dışortam"
@@ -23961,28 +24807,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr "Dış ortam dükkanları düzenle"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr ""
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr ""
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr ""
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "Kasa"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "Banka"
@@ -23990,14 +24836,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "Banka düzenle"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr "Döviz Bürosu"
@@ -24005,5 +24851,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr "Döviz Bürosu Düzenle"
@@ -24011,15 +24857,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "ATM Düzenle"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "Sağlık"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "Doktor"
@@ -24027,18 +24873,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "Doktor Düzenle"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "Dişçi"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "Dişçi Düzenle"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "Eczane"
@@ -24046,5 +24892,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "Eczane Düzenle"
@@ -24052,9 +24898,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr "Dispenser"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "Hastane"
@@ -24062,10 +24908,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "Hastane Düzenle"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr "Acil Durum Noktası"
@@ -24074,5 +24920,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr "Acil Durum Noktası Düzenle"
@@ -24081,20 +24927,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr "Nokta Numarası"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "Telefon Numarası"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Uluslararası kod kullanın, ör +90-212-67890)"
@@ -24102,5 +24948,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "Veteriner"
@@ -24109,64 +24955,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "Veteriner Düzenle"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "Yerler"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr "Kıta"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr "Kıta Düzenle"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr "Ülke"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr "Ülke Düzenle"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr "İl"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr "İl Düzenle"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr "Bölge"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr "Bölge Düzenle"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr "vilayet"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr "vilayet Düzenle"
@@ -24174,15 +25020,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "Şehir"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "Şehir Düzenle"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "Mahalle"
@@ -24190,10 +25036,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "Mahalle Düzenle"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "Banliyo"
@@ -24201,25 +25047,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "Banliyo Düzenle"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "Köy"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "Köy Düzenle"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr "Mezra"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr "Mezra Düzenle"
@@ -24227,5 +25073,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr "Semt"
@@ -24233,10 +25079,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr "Semt Düzenle"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "Ada"
@@ -24244,10 +25090,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "Ada Düzenle"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr ""
@@ -24255,5 +25101,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr ""
@@ -24261,5 +25107,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "Mağara Girişi"
@@ -24267,10 +25113,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "Mağara Girişi Düzenle"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "Zirve"
@@ -24278,10 +25124,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "Zirve Düzenle"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "Buzul"
@@ -24289,10 +25135,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "Buzul Düzenle"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "Volkan"
@@ -24300,70 +25146,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "Volkan Düzenle"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "Belediye Sınırı"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "Milli"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "Ülke Sınırı Düzenle"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "İdari"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "İdari Sınırları Düzenle"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr "Sivil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr "Sivil Sınırları Düzenle"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "Politik Sınır Düzenle"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "Milli Park Sınırı Düzenle"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "Arazi Kullanımı"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "Ağaç"
@@ -24372,15 +25218,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "Ağaç Düzenle"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "Botannik İsim"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr "Orman"
@@ -24389,5 +25235,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr "Orman Düzenle"
@@ -24395,17 +25241,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "Kozalaklı Orman"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "yaprak düken orman"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "karışık"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "orman"
@@ -24414,14 +25260,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "orman kullanımı düzenle"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "korunacak doğa alanı"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "korunacak doğa alanı düzenle"
@@ -24429,25 +25275,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr "Taşlık Alan"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr "Taşlık Alan Düzenle"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr "Çalılık"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr "Çalılık Düzenle"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr "Dağ Eteği"
@@ -24455,10 +25301,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr "Dağ Eteği Kullanımı"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr "Sağlıksız Ağaç"
@@ -24466,5 +25312,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr "Sağlıksız Ağaç Düzenle"
@@ -24472,5 +25318,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr "Çiftlik"
@@ -24479,45 +25325,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr "Çiftlik Kullanımı Düzenle"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr "Çiftlik Arazisi"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr "Çiftlik Arazisi Kullanımı Düzenle"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr "Bağ"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr "Bağ Kullanımı Düzenle"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr "Kiralık Tarım Alanı"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr "Kiralık Tarım Alanı Düzenle"
@@ -24525,25 +25371,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "Bahçe"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "Bahçe Düzenle"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "Otlak"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr "Otlak Kullanım Düzenle"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr "Köy Yerleşimi"
@@ -24551,10 +25397,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr "Köy Yerleşimi Düzenle"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr "Genel"
@@ -24562,20 +25408,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr "Genel Düzenle"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "Park Düzenle"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr "oyun alanı"
@@ -24583,5 +25429,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr "oyun alanı kullanımı düzenle"
@@ -24589,15 +25435,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr "Yerleşim Alanı"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr "Yerleşim Alanı Kullanımı Düzenle"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr "Mezarlık"
@@ -24605,9 +25451,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr "Mezarlık Düzenle"
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr "Mezarlık"
@@ -24615,39 +25461,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr "Mezarlık Kullanımı Düzenle"
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr "Perakende"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr "Perakende Alan Kullanımı Düzenle"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr "Ticari"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr "Ticari Alan Kullanımı Düzenle"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "Endüstriyel"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr "Endüstriyel Alan Kullanımı Düzenle"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr "Demiryolu alanı"
@@ -24655,15 +25501,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr "Demiryolu alanı kullanımı düzenle"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr "Askeri"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr "Askeri Alan Düzenle"
@@ -24671,50 +25517,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr "İnşaat Alanı"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr "İnşaat Alanı Düzenle"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr "Ağaçsız_Alan"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr "Ağaçsız_Alan Kullanımı Düzenle"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr "Yeşil Alan"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr "yeşil Alan kullanımı düzenle"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr "Toprak Dolum"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr "Toprak Dolum Alanı Düzenle"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr "Taşocağı"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr "taşocağı Düzenle"
@@ -24724,5 +25570,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr ""
@@ -24731,10 +25577,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr ""
@@ -24742,5 +25588,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr ""
@@ -24749,5 +25595,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -24755,34 +25601,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr ""
@@ -24791,15 +25637,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr ""
@@ -24807,5 +25653,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr ""
@@ -24814,5 +25660,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr ""
@@ -24820,5 +25666,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr ""
@@ -24909,5 +25755,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -24917,17 +25763,17 @@
 msgstr "bisiklet"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr "otobüs"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr ""
@@ -24987,5 +25833,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -24994,9 +25840,9 @@
 msgstr "ayak"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr ""
@@ -25010,10 +25856,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr ""
@@ -25021,31 +25867,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr ""
@@ -25054,107 +25900,32 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 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 "standard"
 
 #. mappaint style named "standard"
@@ -25690,77 +26461,4 @@
 msgid "highway_track"
 msgstr "araçyolu_hattı"
-
-#. 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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
-msgstr "demiryolu"
 
 #. color rail
@@ -26148,7 +26846,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "baptist"
+msgstr ""
 
 #. color manmade
@@ -29287,80 +29984,4 @@
 msgstr ""
 
-#~ msgid "Bridleway"
-#~ msgstr "At yolu"
-
-#~ msgid "Cycleway"
-#~ msgstr "Bisiklet yolu"
-
-#~ msgid "Footway"
-#~ msgstr "Yürüyüş Yolu"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "İz derecesi 1"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "İz derecesi 1 düzenle"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "İz derecesi 2"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "İz derecesi 2 düzenle"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "İz derecesi 3"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "İz derecesi 3 düzenle"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "İz derecesi 4"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "İz derecesi 4 düzenle"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "İz derecesi 5"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "İz derecesi 5 düzenle"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "gezme düzenle"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "Dağ gezisi düzenle"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "istenen dağ gezisi düzenle"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "Dağ Gezisi düzenle"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "istenen Dağ Gezisi düzenle"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "Zor Dağ Gezisi düzenle"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "Id > 0 gerekiyordu, {0} elde edildi"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "parametre ''{0}'' zero (null) olamaz"
-
-#~ msgid ""
-#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
-#~ "This can lead to nodes being deleted accidentally.\n"
-#~ "Are you really sure to continue?"
-#~ msgstr ""
-#~ "Seçilen yollar indirilen alanın dışındada noktalara sahip.\n"
-#~ "Bu işlem yanlışlıkla nokta silinmesine sebep olabilir.\n"
-#~ "Devam etmek istiyormusunuz?"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "görüntü"
-
 #~ msgid "Preparing..."
 #~ msgstr "Hazırlanıyor..."
@@ -29529,4 +30150,8 @@
 #~ msgstr "zaman dilimi farkı: "
 
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "görüntü"
+
 #~ msgid "{0} within the track."
 #~ msgstr "{0} izde var."
@@ -29549,7 +30174,4 @@
 #~ msgid "GPS unit timezone (difference to photo)"
 #~ msgstr "GPS ünitesi zamandilimi (resim farkı)"
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "Girilen zaman ayrıştırılamadı."
 
 #~ msgid "The base URL for the OSM server (REST API)"
@@ -29805,7 +30427,4 @@
 #~ msgstr "Bilinmeyen dosya uzantısı."
 
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "Ortogonal yapmak için uygun açılı yollar seçiniz."
-
 #~ msgid "No data imported."
 #~ msgstr "İçeri bilgi alınamadı."
@@ -29849,4 +30468,13 @@
 #~ msgid "error requesting update"
 #~ msgstr "güncelleme isteğinde hata"
+
+#~ msgid ""
+#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
+#~ "This can lead to nodes being deleted accidentally.\n"
+#~ "Are you really sure to continue?"
+#~ msgstr ""
+#~ "Seçilen yollar indirilen alanın dışındada noktalara sahip.\n"
+#~ "Bu işlem yanlışlıkla nokta silinmesine sebep olabilir.\n"
+#~ "Devam etmek istiyormusunuz?"
 
 #~ msgid "Open images with AgPifoJ..."
@@ -29991,4 +30619,46 @@
 #~ msgstr "Oberpfalz Geofabrik.de"
 
+#~ msgid "Motorboat"
+#~ msgstr "Motorboat"
+
+#~ msgid "Boat"
+#~ msgstr "Boat"
+
+#~ msgid "Bridleway"
+#~ msgstr "At yolu"
+
+#~ msgid "Cycleway"
+#~ msgstr "Bisiklet yolu"
+
+#~ msgid "Footway"
+#~ msgstr "Yürüyüş Yolu"
+
+#~ msgid "Track Grade 1"
+#~ msgstr "İz derecesi 1"
+
+#~ msgid "Track Grade 2"
+#~ msgstr "İz derecesi 2"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "İz derecesi 3"
+
+#~ msgid "Track Grade 4"
+#~ msgstr "İz derecesi 4"
+
+#~ msgid "Track Grade 5"
+#~ msgstr "İz derecesi 5"
+
+#~ msgid "Edit Hiking"
+#~ msgstr "gezme düzenle"
+
+#~ msgid "Edit Mountain Hiking"
+#~ msgstr "Dağ gezisi düzenle"
+
+#~ msgid "Edit Demanding Mountain Hiking"
+#~ msgstr "istenen dağ gezisi düzenle"
+
+#~ msgid "Edit Alpine Hiking"
+#~ msgstr "Dağ Gezisi düzenle"
+
 #~ msgid "Drawbridge"
 #~ msgstr "Asma Köprü"
@@ -29997,7 +30667,4 @@
 #~ msgstr "Demir parmaklık"
 
-#~ msgid "Station"
-#~ msgstr "İstasyon"
-
 #~ msgid "Shop"
 #~ msgstr "Alışveriş"
@@ -30015,7 +30682,4 @@
 #~ msgstr "bisikletharitası"
 
-#~ msgid "board"
-#~ msgstr "yiyecek noktası"
-
 #~ msgid "Charge"
 #~ msgstr "Para Değişim"
@@ -30023,4 +30687,25 @@
 #~ msgid "Plugin requires JOSM update: {0}."
 #~ msgstr "eklenti JOSM’un güncellemesini gerektiriyor: {0}."
+
+#~ msgid "Edit Track of grade 1"
+#~ msgstr "İz derecesi 1 düzenle"
+
+#~ msgid "Edit Track of grade 2"
+#~ msgstr "İz derecesi 2 düzenle"
+
+#~ msgid "Edit Track of grade 3"
+#~ msgstr "İz derecesi 3 düzenle"
+
+#~ msgid "Edit Track of grade 4"
+#~ msgstr "İz derecesi 4 düzenle"
+
+#~ msgid "Edit Track of grade 5"
+#~ msgstr "İz derecesi 5 düzenle"
+
+#~ msgid "Edit Demanding Alpine Hiking"
+#~ msgstr "istenen Dağ Gezisi düzenle"
+
+#~ msgid "Edit Difficult Alpine Hiking"
+#~ msgstr "Zor Dağ Gezisi düzenle"
 
 #~ msgid "Edit Drawbridge"
@@ -30074,4 +30759,7 @@
 #~ "\">türkçe</A> olarak oluştur."
 
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "parametre ''{0}'' zero (null) olamaz"
+
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Okunamadı \"{0}\""
@@ -30079,2 +30767,5 @@
 #~ msgid "Update Selection"
 #~ msgstr "Seçimi Güncelle"
+
+#~ msgid "Id > 0 required, got {0}"
+#~ msgstr "Id > 0 gerekiyordu, {0} elde edildi"
Index: applications/editors/josm/i18n/po/zh_TW.po
===================================================================
--- applications/editors/josm/i18n/po/zh_TW.po	(revision 19689)
+++ applications/editors/josm/i18n/po/zh_TW.po	(revision 19698)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 23:20-0500\n"
-"PO-Revision-Date: 2010-01-18 13:47-0500\n"
+"POT-Creation-Date: 2010-01-31 16:51+0100\n"
+"PO-Revision-Date: 2010-01-23 22:20+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-01-13 18:25+0000\n"
+"X-Launchpad-Export-Date: 2010-01-31 15:38+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: zh_TW\n"
@@ -71,11 +71,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:799
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:737
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:797
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:72
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:234
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:266
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:172
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:237
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:269
+#: ../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:222
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:247
@@ -236,5 +236,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:168
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
@@ -248,13 +248,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:409
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:267
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:129
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:338
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:90
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:116
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:118
@@ -263,5 +263,8 @@
 #: ../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/GeotaggingPlugin.java:105
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:318
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:272
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:151
 #: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:178
@@ -287,5 +290,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:72
 #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:20
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:438
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:446
 msgid "Merge"
 msgstr "合併"
@@ -314,5 +317,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:57
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
@@ -379,9 +382,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:107
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:322
@@ -389,5 +392,7 @@
 #: ../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/GeotaggingPlugin.java:105
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:333
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
 msgid "OK"
 msgstr "確定"
@@ -438,6 +443,6 @@
 #: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java:47
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
-#: ../plugins/terracer/src/terracer/TerracerAction.java:55
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
+#: ../plugins/terracer/src/terracer/TerracerAction.java:63
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:45
 #, java-format
@@ -455,5 +460,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:71
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:245
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:67
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:88
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:266
 #: ../core/src/org/openstreetmap/josm/actions/DistributeAction.java:66
@@ -462,11 +467,11 @@
 #: ../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:188
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:251
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:247
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:812
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:841
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:665
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:668
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:88
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:119
@@ -503,5 +508,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:35
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:60
 msgid "conflict"
 msgstr "衝突"
@@ -632,14 +637,14 @@
 msgstr "請選擇至少兩個以上的路徑來合併"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:24
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:26
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:29
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:31
 msgid "Copy"
 msgstr "複製"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:25
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:30
 msgid "Copy selected objects to paste buffer."
 msgstr "複製選取的物件到剪貼簿"
 
-#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:66
+#: ../core/src/org/openstreetmap/josm/actions/CopyAction.java:87
 msgid "Please select something to copy."
 msgstr "請選擇物件"
@@ -670,8 +675,8 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:372
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:94
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:268
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:887
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:586
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:606
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:141
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:216
@@ -680,5 +685,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:134
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:215
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:683
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:686
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:95
 msgid "Delete"
@@ -735,14 +740,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:329
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:484
-#, fuzzy, java-format
+#, java-format
 msgid "There was {0} conflict during import."
 msgid_plural "There were {0} conflicts during import."
-msgstr[0] "匯入時有 {0} 個衝突。"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:231
-#, fuzzy
 msgid "Conflict during download"
 msgid_plural "Conflicts during download"
-msgstr[0] "下載時遇到衝突"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:256
@@ -763,4 +769,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:21
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1369
 msgid "Duplicate"
@@ -770,4 +778,32 @@
 msgid "Duplicate selection by copy and immediate paste."
 msgstr "重製會複製選擇區域並立即貼上。"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+msgid "Duplicate Layer"
+msgstr "重製路徑"
+
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20
+#, fuzzy
+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:142
+#, java-format
+msgid "Layer: {0}"
+msgstr "圖層：{0}"
+
+#. Translators: "Copy of {layer name}"
+#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:42
+#, fuzzy, 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 ""
 
 #. <button label="Info" hotkey="I">
@@ -858,9 +894,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:152
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65
-#, fuzzy
 msgid "The selected way has nodes outside of the downloaded data region."
 msgid_plural ""
 "The selected ways have nodes outside of the downloaded data region."
-msgstr[0] "選取的路徑未包含選取的節點。"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155
@@ -979,5 +1015,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:94
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "URL"
 msgstr "URL"
@@ -1127,5 +1163,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:120
-msgid "<html>Cannot open directory.<br>Please select a file!"
+msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 msgstr ""
 
@@ -1139,8 +1175,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Opening {0} file..."
 msgid_plural "Opening {0} files..."
-msgstr[0] "正在開啟檔案"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:169
@@ -1196,7 +1233,7 @@
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
 msgid ""
-"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 "
+"<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.)"
@@ -1210,5 +1247,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:47
-msgid "Move nodes so all angles are 90 or 270 degree"
+#, fuzzy
+msgid "Move nodes so all angles are 90 or 270 degrees"
 msgstr "移動節點讓所有角度成為 90 或 270 度"
 
@@ -1242,4 +1280,8 @@
 "undesirable results when doing rectangular alignments.<br>Change your "
 "projection to get rid of this warning.<br>Do you want to continue?</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:146
+msgid "Selection must consist only of ways and nodes."
 msgstr ""
 
@@ -1256,4 +1298,15 @@
 msgid "Selected Elements cannot be orthogonalized"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:262
+msgid ""
+"<html>Please make sure all selected ways head in a similar direction<br>or "
+"orthogonalize them one by one.</html>"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:415
+#, fuzzy
+msgid "Please select ways with angles of approximately 90 or 180 degrees."
+msgstr "請選擇有近乎正確角度的路徑來做直角化。"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1358,18 +1411,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:399
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:412
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1070
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:229
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:614
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:251
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:345
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:242
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1065
+#: ../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:231
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:634
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:254
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:348
+#: ../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:159
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:735
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:653
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:661
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:667
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:675
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:63
 #: ../core/src/org/openstreetmap/josm/io/FileImporter.java:77
@@ -1394,12 +1447,13 @@
 #: ../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/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:68
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#: ../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:64
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:69
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:278
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:78
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:239
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:439
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:313
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:445
 msgid "Error"
 msgstr "錯誤"
@@ -1529,5 +1583,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:408
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:124
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:932
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:246
 msgid "Close"
@@ -1720,4 +1774,5 @@
 msgid_plural "Dupe {0} nodes into {1} nodes"
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24
@@ -1761,5 +1816,5 @@
 #.
 #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:90
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:977
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:975
 msgid "Download data"
 msgstr "下載資料"
@@ -2179,6 +2234,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:357
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:104
@@ -2257,7 +2312,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
-#, fuzzy
 msgid "<not>"
-msgstr "北"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:25
@@ -2299,5 +2353,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:49
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search for objects."
 msgstr "搜尋物件。"
@@ -2486,5 +2540,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:155
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:139
 msgid "Search"
 msgstr "搜尋"
@@ -2524,25 +2578,22 @@
 
 #. case sensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:323
 msgctxt "search"
 msgid "CS"
-msgstr "CS"
+msgstr ""
 
 #. case insensitive
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:325
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:324
 msgctxt "search"
 msgid "CI"
-msgstr "CI"
+msgstr ""
 
 #. regex search
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:327
-#, fuzzy
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:326
 msgctxt "search"
 msgid "RX"
-msgstr "RX"
-
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:49
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:48
 #, java-format
 msgid ""
@@ -2555,9 +2606,9 @@
 "{2}"
 
-#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:252
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:251
 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:294
+#: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:293
 #, java-format
 msgid "Pattern Syntax Error: Pattern {0} in {1} is illegal!"
@@ -2579,7 +2630,7 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:656
-#, fuzzy, java-format
+#, java-format
 msgid "Unexpected token. Expected {0}, found {1}"
-msgstr "未預期的記號：{0}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:659
@@ -2696,8 +2747,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/AddPrimitivesCommand.java:49
-#, fuzzy, java-format
+#, java-format
 msgid "Added {0} object"
 msgid_plural "Added {0} objects"
-msgstr[0] "已加入 {0} 物件"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49
@@ -2747,12 +2799,12 @@
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:117
-#, fuzzy, java-format
+#, java-format
 msgid "Remove \"{0}\" for {1} objects"
-msgstr "從 {1} {2} 移除「{0}」"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:118
-#, fuzzy, java-format
+#, java-format
 msgid "Set {0}={1} for {2} objects"
-msgstr "將 {2} {3} 設定 {0}={1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java:72
@@ -2812,17 +2864,17 @@
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:161
-#, fuzzy, java-format
+#, java-format
 msgid "Delete node {0}"
-msgstr "刪除模式"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162
-#, fuzzy, java-format
+#, java-format
 msgid "Delete way {0}"
-msgstr "刪除 {0} 個路徑"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163
-#, fuzzy, java-format
+#, java-format
 msgid "Delete relation {0}"
-msgstr "刪除 {0} 個關係"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177
@@ -2897,8 +2949,9 @@
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:112
-#, fuzzy, java-format
+#, java-format
 msgid "Purged {0} object"
 msgid_plural "Purged {0} objects"
-msgstr[0] "清理的 {0} 物件"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155
@@ -2945,23 +2998,24 @@
 
 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
-#, fuzzy, java-format
+#, java-format
 msgid "Undelete {0} primitive"
 msgid_plural "Undelete {0} primitives"
-msgstr[0] "取消刪除 {0} 原型"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for node {0}"
-msgstr "解決節點 {0} 版本衝突"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:42
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for way {0}"
-msgstr "解決路徑 {0} 版本衝突"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:43
-#, fuzzy, java-format
+#, java-format
 msgid "Resolve version conflict for relation {0}"
-msgstr "解決關係 {0} 版本衝突"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
@@ -3188,5 +3242,5 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:140
 msgid "Warning: the revision file ''/REVISION'' is missing."
-msgstr ""
+msgstr "警告：缺少修訂版檔案「/REVISION」。"
 
 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java:76
@@ -3210,5 +3264,5 @@
 
 #. short symbol for South
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:86
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:89
 msgctxt "compass"
 msgid "S"
@@ -3216,5 +3270,5 @@
 
 #. short symbol for North
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:87
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:90
 msgctxt "compass"
 msgid "N"
@@ -3222,5 +3276,5 @@
 
 #. short symbol for West
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:100
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:103
 msgctxt "compass"
 msgid "W"
@@ -3228,5 +3282,5 @@
 
 #. short symbol for East
-#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:101
+#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:104
 msgctxt "compass"
 msgid "E"
@@ -3295,8 +3349,7 @@
 #. column header: hide filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:143
-#, fuzzy
 msgctxt "filter"
 msgid "H"
-msgstr "H"
+msgstr ""
 
 #. column header: filter text
@@ -3308,67 +3361,60 @@
 #. column header: apply filter for children
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:145
-#, fuzzy
 msgctxt "filter"
 msgid "C"
-msgstr "C"
+msgstr ""
 
 #. column header: inverted filter
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:146
-#, fuzzy
 msgctxt "filter"
 msgid "I"
-msgstr "I"
+msgstr ""
 
 #. column header: filter mode
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:147
-#, fuzzy
 msgctxt "filter"
 msgid "M"
-msgstr "M"
+msgstr ""
 
 #. translators notes must be in front
 #. filter mode: replace
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:210
-#, fuzzy
 msgctxt "filter"
 msgid "R"
-msgstr "R"
+msgstr ""
 
 #. filter mode: add
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:211
-#, fuzzy
 msgctxt "filter"
 msgid "A"
-msgstr "A"
+msgstr ""
 
 #. filter mode: remove
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:212
-#, fuzzy
 msgctxt "filter"
 msgid "D"
-msgstr "D"
+msgstr ""
 
 #. filter mode: in selection
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:213
-#, fuzzy
 msgctxt "filter"
 msgid "F"
-msgstr "F"
-
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:403
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:350
 msgid "A primitive with ID = 0 cannot be invisible."
 msgstr "ID = 0 的原型不能為不可視。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:460
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:407
 #, java-format
 msgid "ID > 0 expected. Got {0}."
 msgstr "預期 ID > 0。收到 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:462
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:409
 #, java-format
 msgid "Version > 0 expected. Got {0}."
 msgstr "預期版本 > 0。收到 {0}。"
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:656
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:620
 #, java-format
 msgid ""
@@ -3377,5 +3423,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1041
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:992
 msgid ""
 "Cannot merge because either of the participating primitives is new and the "
@@ -3383,5 +3429,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1043
+#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:994
 #, java-format
 msgid ""
@@ -3504,6 +3550,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:104
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:105
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:50
 msgid "node"
@@ -3512,5 +3558,5 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:62
 msgid "way"
@@ -3520,7 +3566,7 @@
 #. dark blue
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:166
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:343
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:167
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:361
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:72
 msgid "relation"
@@ -3541,5 +3587,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:174
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178
 msgid "background"
 msgstr "背景"
@@ -3683,6 +3729,6 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:82
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:264
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:83
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:282
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/util/NameVisitor.java:82
 #, java-format
@@ -3690,37 +3736,38 @@
 msgstr " [id: {0}]"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:96
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:121
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:159
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:97
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:122
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:160
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:214
 msgid "incomplete"
 msgstr "不完整"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:133
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:318
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:336
 msgid "highway"
 msgstr "公路"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:134
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:319
-#: build/trans_presets.java:3051
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:337
+#: build/trans_presets.java:3219
 msgid "railway"
 msgstr "鐵路"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:135
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:320
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:338
 msgid "waterway"
 msgstr "航道"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:136
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:321
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:137
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:339
 msgid "landuse"
 msgstr "土地利用"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:143
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:326
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:144
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:344
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:463
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:337
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:258
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:505
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:260
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
 #, java-format
 msgid "{0} node"
@@ -3728,10 +3775,10 @@
 msgstr[0] "{0} 節點"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:163
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:164
 msgid "public transport"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:199
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:371
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:204
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:389
 #, java-format
 msgid "{0} member"
@@ -3739,5 +3786,5 @@
 msgstr[0] "{0} 成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:212
+#: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:230
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java:62
 #, java-format
@@ -3774,6 +3821,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:225
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 msgid "Conflict"
 msgstr "衝突"
@@ -3784,7 +3831,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:265
-#, fuzzy
-msgid "Authorization Failed"
-msgstr "驗證"
+msgid "Authorisation Failed"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:281
@@ -3985,5 +4031,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:49
 msgid "Initializing"
 msgstr "初始化"
@@ -4024,5 +4069,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:165
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:79
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:932
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
@@ -4033,5 +4078,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:149
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/LaunchAction.java:37
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:643
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:646
 msgid "Edit"
 msgstr "編輯"
@@ -4102,29 +4147,29 @@
 msgstr "縮放"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:99
 msgid "The geographic longitude at the mouse pointer."
 msgstr "滑鼠指標所在的地理經度。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:101
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:100
 msgid "The name of the object at the mouse pointer."
 msgstr "滑鼠指標所在的物件名稱。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:102
 msgid "The geographic latitude at the mouse pointer."
 msgstr "滑鼠指標所在的地理緯度。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:103
 msgid "The angle between the previous and the current way segment."
 msgstr "前一個路徑區段與目前區段之間的角度。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:104
 msgid "The (compass) heading of the line segment being drawn."
 msgstr "繪出線段的（指南針）箭頭。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:106
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:105
 msgid "The length of the new way segment being drawn."
 msgstr "繪出新的路徑區段的長度。"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:204
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
 msgid ""
 "Middle click again to cycle through.<br>Hold CTRL to select directly from "
@@ -4132,9 +4177,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:299
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:298
 msgid "(no object)"
 msgstr "(沒有物件)"
 
-#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:435
+#: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:434
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:133
 msgid "User:"
@@ -4299,14 +4344,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:169
-#, fuzzy, java-format
+#, java-format
 msgid "Tags({0} conflict)"
 msgid_plural "Tags({0} conflicts)"
-msgstr[0] "標籤({0} 衝突)"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:170
-#, fuzzy, java-format
+#, java-format
 msgid "{0} pending tag conflict to be resolved"
 msgid_plural "{0} pending tag conflicts to be resolved"
-msgstr[0] "{0} 個標籤衝突待解決"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
@@ -4361,16 +4408,16 @@
 msgstr "衝突的決議"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:587
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:611
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:564
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:588
 #, 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:760
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:737
 #, java-format
 msgid "Unexpected value of parameter ''index''. Got {0}."
 msgstr "參數「index」有未預期的數值。得到 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:774
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:751
 #, java-format
 msgid "Item {0} not found in list."
@@ -4563,7 +4610,12 @@
 msgstr "節點"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:67
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:72
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
 msgstr "合併的節點尚未凍結。不能建置決議指令"
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:93
+#, java-format
+msgid "Node {0} cannot be added to the way because it was deleted"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:419
@@ -4589,5 +4641,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:470
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional node used by way {1}<br>which is deleted on the "
@@ -4597,6 +4649,5 @@
 "server.<br><br>Do you want to undelete these nodes too?"
 msgstr[0] ""
-"<html>還有 {0} 個額外的節點也是用於這條在伺服器上<br>已刪除的路徑 {1}。"
-"<br><br>是否要一併取消這些節點的刪除？</html>"
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:480
@@ -4605,5 +4656,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:504
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "There is {0} additional primitive referred to by relation {1}<br>which is "
@@ -4613,6 +4664,5 @@
 "deleted on the server.<br><br>Do you want to undelete these too?"
 msgstr[0] ""
-"<html>這裡有 {0} 個額外的原型參照到已在<br>伺服器上刪除的關係 {1}。<br><br>是"
-"否要將它們取消刪除？</html>"
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
@@ -4713,5 +4763,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:577
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:210
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
 msgid "No, abort"
 msgstr "否，中止"
@@ -4760,5 +4810,10 @@
 msgstr "原型"
 
-#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:111
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:103
+#, java-format
+msgid "Primitive {0} cannot be added to the relation because it was deleted."
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:124
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
 msgstr "合併的節點尚未凍結。不能建置決議指令"
@@ -4888,10 +4943,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:168
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:165
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "none"
 msgstr "沒有"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "all"
 msgstr "全部"
@@ -4970,7 +5025,7 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:464
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:333
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:259
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:510
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:336
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:261
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
 #, java-format
 msgid "{0} way"
@@ -4979,6 +5034,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:465
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:341
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
 #, java-format
 msgid "{0} relation"
@@ -5160,10 +5215,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:50
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:66
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:444
@@ -5183,18 +5238,18 @@
 msgstr "指令堆疊：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
 msgid "Resolve conflicts."
 msgstr "調解衝突。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:337
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:320
 msgid "Resolve"
 msgstr "解決"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:338
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:321
 msgid "Open a merge dialog of all selected items in the list above."
 msgstr "開啟上列清單所有選取的項目的合併對話盒。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:358
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:115
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:341
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
 msgid ""
@@ -5226,8 +5281,9 @@
 msgid ""
 "<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions won't be applied unless all differences<br>are "
-"resolved.Click <strong>{0}</strong> to close anyway."
-"<strong>Already<br>resolved differences won't be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+"<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 ""
 
@@ -5250,5 +5306,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:67
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:920
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:124
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:180
@@ -5257,5 +5313,5 @@
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:108
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:271
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:628
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:631
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:73
 msgid "Add"
@@ -5335,43 +5391,48 @@
 msgstr "顯示選取物件的歷史紀錄。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:156
 msgid "Layers"
 msgstr "圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:148
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155
 msgid "Open a list of all loaded layers."
 msgstr "開啟所有載入圖層的清單。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:267
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275
 msgid "Delete the selected layers."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:328
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336
 msgid "Show/Hide"
 msgstr "顯示/隱藏"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:339
+#: ../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:374
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:382
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:489
 msgid "Activate"
 msgstr "使用"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:380
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388
 msgid "Activate the selected layer"
 msgstr "使用選取的圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:444
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452
 msgid "Merge this layer into another layer"
 msgstr "將這個圖層合併至另一個圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:546
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
+#, fuzzy
+msgid "Duplicate this layer"
+msgstr "重製路徑"
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
 msgid "Move the selected layer one row up."
 msgstr "將選取的圖層上移一列。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:565
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:622
 msgid "Move the selected layer one row down."
 msgstr "將選取的圖層下移一列。"
@@ -5385,6 +5446,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:88
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:89
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:173
-#: build/trans_presets.java:3016
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:181
+#: build/trans_presets.java:3184
 msgid "Relations"
 msgstr "關係"
@@ -5394,69 +5455,69 @@
 msgstr "開啓所有關係的清單。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:171
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:179
 #, java-format
 msgid "Relations: {0}"
 msgstr "關係：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:265
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:277
 msgid "Open an editor for the selected relation"
 msgstr "開啓選取的關係編輯器"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:306
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:318
 msgid "Delete the selected relation"
 msgstr "刪除選取的關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:344
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:356
 msgid "Create a new relation"
 msgstr "建立新的關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:381
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:393
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1366
 msgid "Create a copy of this relation and open it in another editor window"
 msgstr "建立這個關係的複本並且在另一個編輯器視窗開啟它"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:419
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:431
 msgid "Set the current selection to the list of selected relations"
 msgstr "將目前的選擇區域設定到選取關係的清單"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:446
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:458
 msgid "Select the members of all selected relations"
 msgstr "選擇所有已選取關係的成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:448
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:460
 msgid "Select members"
 msgstr "選擇成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:478
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:490
 msgid "Download all members of the selected relations"
 msgstr "下載已選取關係的所有成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:479
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:491
 msgid "Download members"
 msgstr "下載成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:84
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:86
 msgid "Current Selection"
 msgstr "目前的選擇區域"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:83
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:85
 msgid "Open a selection list window."
 msgstr "開啓選擇區域清單視窗。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:130
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:132
 msgid "Zoom to selected element(s)"
 msgstr "縮放至選取的元件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:149
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151
 msgid "Zoom to selection"
 msgstr "縮放至選擇區域"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:289
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:277
 #, 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:291
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:279
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:348
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
@@ -5464,5 +5525,5 @@
 msgstr "選擇區域"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:343
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:346
 #, java-format
 msgid "Selection: {0}"
@@ -5724,4 +5785,5 @@
 "''{0}''.</html>"
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331
@@ -5811,8 +5873,6 @@
 #. <optional>
 #. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <!--     FIXME: no entry in the Wiki
 #. <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" />
@@ -5884,4 +5944,7 @@
 #. <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 />
@@ -5960,6 +6023,7 @@
 #. item "Aerialway/Station" label "Edit Station"
 #. <key key="aerialway" value="station" />
-#. item "Car/Fuel" label "Edit Fuel"
-#. <key key="amenity" value="fuel" />
+#. item "Aerialway/Pylon" label "Edit Pylon"
+#. <key key="aerialway" value="pylon" />
+#. <optional>
 #. item "Car/Parking" label "Edit Parking"
 #. <key key="amenity" value="parking" />
@@ -6001,6 +6065,8 @@
 #. item "Public Transport/Taxi" label "Edit Taxi station"
 #. <key key="amenity" value="taxi" />
-#. item "Public Transport/Airport" label "Edit Airport"
+#. 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" />
@@ -6469,152 +6535,154 @@
 #. <optional>
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java:41
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:423
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:425
 #: ../core/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java:21
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
 #: build/trans_presets.java:78 build/trans_presets.java:114
 #: build/trans_presets.java:154 build/trans_presets.java:191
 #: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:246 build/trans_presets.java:264
-#: build/trans_presets.java:282 build/trans_presets.java:302
-#: build/trans_presets.java:335 build/trans_presets.java:381
-#: build/trans_presets.java:401 build/trans_presets.java:416
-#: build/trans_presets.java:433 build/trans_presets.java:453
-#: build/trans_presets.java:477 build/trans_presets.java:505
+#: build/trans_presets.java:247 build/trans_presets.java:265
+#: build/trans_presets.java:283 build/trans_presets.java:303
+#: build/trans_presets.java:337 build/trans_presets.java:382
+#: build/trans_presets.java:402 build/trans_presets.java:417
+#: build/trans_presets.java:432 build/trans_presets.java:452
+#: build/trans_presets.java:476 build/trans_presets.java:505
 #: build/trans_presets.java:525 build/trans_presets.java:548
-#: build/trans_presets.java:570 build/trans_presets.java:588
-#: build/trans_presets.java:609 build/trans_presets.java:628
-#: build/trans_presets.java:637 build/trans_presets.java:684
-#: build/trans_presets.java:705 build/trans_presets.java:714
-#: build/trans_presets.java:774 build/trans_presets.java:925
-#: build/trans_presets.java:933 build/trans_presets.java:941
-#: build/trans_presets.java:949 build/trans_presets.java:959
-#: build/trans_presets.java:967 build/trans_presets.java:972
-#: build/trans_presets.java:979 build/trans_presets.java:986
-#: build/trans_presets.java:991 build/trans_presets.java:999
-#: build/trans_presets.java:1008 build/trans_presets.java:1014
-#: build/trans_presets.java:1020 build/trans_presets.java:1025
-#: build/trans_presets.java:1031 build/trans_presets.java:1037
-#: build/trans_presets.java:1046 build/trans_presets.java:1055
-#: build/trans_presets.java:1062 build/trans_presets.java:1070
-#: build/trans_presets.java:1083 build/trans_presets.java:1089
-#: build/trans_presets.java:1098 build/trans_presets.java:1104
-#: build/trans_presets.java:1110 build/trans_presets.java:1118
-#: build/trans_presets.java:1174 build/trans_presets.java:1221
-#: build/trans_presets.java:1227 build/trans_presets.java:1233
-#: build/trans_presets.java:1239 build/trans_presets.java:1245
-#: build/trans_presets.java:1256 build/trans_presets.java:1265
-#: build/trans_presets.java:1280 build/trans_presets.java:1286
-#: build/trans_presets.java:1294 build/trans_presets.java:1301
-#: build/trans_presets.java:1310 build/trans_presets.java:1318
-#: build/trans_presets.java:1329 build/trans_presets.java:1339
-#: build/trans_presets.java:1349 build/trans_presets.java:1369
-#: build/trans_presets.java:1381 build/trans_presets.java:1392
-#: build/trans_presets.java:1412 build/trans_presets.java:1419
-#: build/trans_presets.java:1435 build/trans_presets.java:1442
-#: build/trans_presets.java:1447 build/trans_presets.java:1453
-#: build/trans_presets.java:1459 build/trans_presets.java:1464
-#: build/trans_presets.java:1470 build/trans_presets.java:1476
-#: build/trans_presets.java:1484 build/trans_presets.java:1492
-#: build/trans_presets.java:1500 build/trans_presets.java:1507
-#: build/trans_presets.java:1513 build/trans_presets.java:1520
-#: build/trans_presets.java:1527 build/trans_presets.java:1535
-#: build/trans_presets.java:1542 build/trans_presets.java:1550
-#: build/trans_presets.java:1557 build/trans_presets.java:1563
-#: build/trans_presets.java:1570 build/trans_presets.java:1577
-#: build/trans_presets.java:1584 build/trans_presets.java:1601
-#: build/trans_presets.java:1609 build/trans_presets.java:1624
-#: build/trans_presets.java:1634 build/trans_presets.java:1646
-#: build/trans_presets.java:1653 build/trans_presets.java:1659
-#: build/trans_presets.java:1669 build/trans_presets.java:1674
-#: build/trans_presets.java:1682 build/trans_presets.java:1689
-#: build/trans_presets.java:1695 build/trans_presets.java:1701
-#: build/trans_presets.java:1707 build/trans_presets.java:1712
-#: build/trans_presets.java:1717 build/trans_presets.java:1722
-#: build/trans_presets.java:1729 build/trans_presets.java:1735
-#: build/trans_presets.java:1740 build/trans_presets.java:1749
-#: build/trans_presets.java:1758 build/trans_presets.java:1767
-#: build/trans_presets.java:1776 build/trans_presets.java:1785
-#: build/trans_presets.java:1791 build/trans_presets.java:1799
-#: build/trans_presets.java:1805 build/trans_presets.java:1811
-#: build/trans_presets.java:1817 build/trans_presets.java:1823
-#: build/trans_presets.java:1829 build/trans_presets.java:1835
-#: build/trans_presets.java:1841 build/trans_presets.java:1847
-#: build/trans_presets.java:1853 build/trans_presets.java:1859
-#: build/trans_presets.java:1865 build/trans_presets.java:1871
-#: build/trans_presets.java:1877 build/trans_presets.java:1883
-#: build/trans_presets.java:1890 build/trans_presets.java:1899
-#: build/trans_presets.java:1907 build/trans_presets.java:1913
-#: build/trans_presets.java:1919 build/trans_presets.java:1925
-#: build/trans_presets.java:1931 build/trans_presets.java:1937
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:1955 build/trans_presets.java:1961
-#: build/trans_presets.java:1967 build/trans_presets.java:1973
-#: build/trans_presets.java:1979 build/trans_presets.java:1985
-#: build/trans_presets.java:1991 build/trans_presets.java:1997
-#: build/trans_presets.java:2003 build/trans_presets.java:2017
-#: build/trans_presets.java:2023 build/trans_presets.java:2029
-#: build/trans_presets.java:2036 build/trans_presets.java:2043
-#: build/trans_presets.java:2051 build/trans_presets.java:2058
-#: build/trans_presets.java:2064 build/trans_presets.java:2071
-#: build/trans_presets.java:2077 build/trans_presets.java:2083
-#: build/trans_presets.java:2089 build/trans_presets.java:2097
-#: build/trans_presets.java:2104 build/trans_presets.java:2111
-#: build/trans_presets.java:2118 build/trans_presets.java:2126
-#: build/trans_presets.java:2158 build/trans_presets.java:2163
-#: build/trans_presets.java:2173 build/trans_presets.java:2178
-#: build/trans_presets.java:2184 build/trans_presets.java:2190
-#: build/trans_presets.java:2207 build/trans_presets.java:2213
-#: build/trans_presets.java:2219 build/trans_presets.java:2225
-#: build/trans_presets.java:2231 build/trans_presets.java:2241
-#: build/trans_presets.java:2248 build/trans_presets.java:2343
-#: build/trans_presets.java:2350 build/trans_presets.java:2365
-#: build/trans_presets.java:2373 build/trans_presets.java:2378
-#: build/trans_presets.java:2384 build/trans_presets.java:2391
-#: build/trans_presets.java:2398 build/trans_presets.java:2404
-#: build/trans_presets.java:2410 build/trans_presets.java:2432
-#: build/trans_presets.java:2439 build/trans_presets.java:2446
-#: build/trans_presets.java:2452 build/trans_presets.java:2459
-#: build/trans_presets.java:2465 build/trans_presets.java:2471
-#: build/trans_presets.java:2477 build/trans_presets.java:2483
-#: build/trans_presets.java:2489 build/trans_presets.java:2496
-#: build/trans_presets.java:2503 build/trans_presets.java:2510
-#: build/trans_presets.java:2516 build/trans_presets.java:2522
-#: build/trans_presets.java:2528 build/trans_presets.java:2534
-#: build/trans_presets.java:2540 build/trans_presets.java:2547
-#: build/trans_presets.java:2554 build/trans_presets.java:2561
-#: build/trans_presets.java:2567 build/trans_presets.java:2573
-#: build/trans_presets.java:2583 build/trans_presets.java:2592
-#: build/trans_presets.java:2607 build/trans_presets.java:2613
-#: build/trans_presets.java:2621 build/trans_presets.java:2628
-#: build/trans_presets.java:2648 build/trans_presets.java:2659
-#: build/trans_presets.java:2665 build/trans_presets.java:2671
-#: build/trans_presets.java:2677 build/trans_presets.java:2683
-#: build/trans_presets.java:2690 build/trans_presets.java:2697
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2716 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2738
-#: build/trans_presets.java:2745 build/trans_presets.java:2751
-#: build/trans_presets.java:2758 build/trans_presets.java:2765
-#: build/trans_presets.java:2774 build/trans_presets.java:2780
-#: build/trans_presets.java:2786 build/trans_presets.java:2792
-#: build/trans_presets.java:2798 build/trans_presets.java:2807
-#: build/trans_presets.java:2817 build/trans_presets.java:2826
-#: build/trans_presets.java:2832 build/trans_presets.java:2838
-#: build/trans_presets.java:2843 build/trans_presets.java:2849
-#: build/trans_presets.java:2855 build/trans_presets.java:2864
-#: build/trans_presets.java:2870 build/trans_presets.java:2876
-#: build/trans_presets.java:2882 build/trans_presets.java:2888
-#: build/trans_presets.java:2894 build/trans_presets.java:2900
-#: build/trans_presets.java:2907 build/trans_presets.java:2913
-#: build/trans_presets.java:2918 build/trans_presets.java:2925
-#: build/trans_presets.java:2932 build/trans_presets.java:2938
-#: build/trans_presets.java:2947 build/trans_presets.java:2955
-#: build/trans_presets.java:2961 build/trans_presets.java:2967
-#: build/trans_presets.java:2974 build/trans_presets.java:2980
-#: build/trans_presets.java:2987 build/trans_presets.java:2993
-#: build/trans_presets.java:2999 build/trans_presets.java:3005
-#: build/trans_presets.java:3011 build/trans_presets.java:3024
-#: build/trans_presets.java:3038 build/trans_presets.java:3052
+#: build/trans_presets.java:570 build/trans_presets.java:590
+#: build/trans_presets.java:613 build/trans_presets.java:632
+#: build/trans_presets.java:641 build/trans_presets.java:699
+#: build/trans_presets.java:725 build/trans_presets.java:734
+#: build/trans_presets.java:794 build/trans_presets.java:945
+#: build/trans_presets.java:953 build/trans_presets.java:961
+#: build/trans_presets.java:969 build/trans_presets.java:977
+#: build/trans_presets.java:987 build/trans_presets.java:995
+#: build/trans_presets.java:1000 build/trans_presets.java:1007
+#: build/trans_presets.java:1014 build/trans_presets.java:1019
+#: build/trans_presets.java:1027 build/trans_presets.java:1036
+#: build/trans_presets.java:1042 build/trans_presets.java:1048
+#: build/trans_presets.java:1053 build/trans_presets.java:1059
+#: build/trans_presets.java:1065 build/trans_presets.java:1074
+#: build/trans_presets.java:1083 build/trans_presets.java:1090
+#: build/trans_presets.java:1098 build/trans_presets.java:1111
+#: build/trans_presets.java:1117 build/trans_presets.java:1126
+#: build/trans_presets.java:1132 build/trans_presets.java:1138
+#: build/trans_presets.java:1146 build/trans_presets.java:1243
+#: build/trans_presets.java:1294 build/trans_presets.java:1300
+#: build/trans_presets.java:1306 build/trans_presets.java:1312
+#: build/trans_presets.java:1318 build/trans_presets.java:1324
+#: build/trans_presets.java:1337 build/trans_presets.java:1361
+#: build/trans_presets.java:1376 build/trans_presets.java:1382
+#: build/trans_presets.java:1390 build/trans_presets.java:1397
+#: build/trans_presets.java:1406 build/trans_presets.java:1414
+#: build/trans_presets.java:1425 build/trans_presets.java:1435
+#: build/trans_presets.java:1445 build/trans_presets.java:1465
+#: build/trans_presets.java:1477 build/trans_presets.java:1488
+#: build/trans_presets.java:1508 build/trans_presets.java:1517
+#: build/trans_presets.java:1573 build/trans_presets.java:1590
+#: build/trans_presets.java:1597 build/trans_presets.java:1602
+#: build/trans_presets.java:1608 build/trans_presets.java:1614
+#: build/trans_presets.java:1619 build/trans_presets.java:1625
+#: build/trans_presets.java:1631 build/trans_presets.java:1639
+#: build/trans_presets.java:1647 build/trans_presets.java:1655
+#: build/trans_presets.java:1662 build/trans_presets.java:1668
+#: build/trans_presets.java:1675 build/trans_presets.java:1682
+#: build/trans_presets.java:1690 build/trans_presets.java:1697
+#: build/trans_presets.java:1705 build/trans_presets.java:1712
+#: build/trans_presets.java:1718 build/trans_presets.java:1725
+#: build/trans_presets.java:1732 build/trans_presets.java:1739
+#: build/trans_presets.java:1756 build/trans_presets.java:1764
+#: build/trans_presets.java:1779 build/trans_presets.java:1789
+#: build/trans_presets.java:1801 build/trans_presets.java:1808
+#: build/trans_presets.java:1814 build/trans_presets.java:1824
+#: build/trans_presets.java:1829 build/trans_presets.java:1837
+#: build/trans_presets.java:1844 build/trans_presets.java:1850
+#: build/trans_presets.java:1856 build/trans_presets.java:1862
+#: build/trans_presets.java:1867 build/trans_presets.java:1872
+#: build/trans_presets.java:1877 build/trans_presets.java:1884
+#: build/trans_presets.java:1890 build/trans_presets.java:1895
+#: build/trans_presets.java:1904 build/trans_presets.java:1913
+#: build/trans_presets.java:1922 build/trans_presets.java:1931
+#: build/trans_presets.java:1940 build/trans_presets.java:1946
+#: build/trans_presets.java:1954 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:2045
+#: build/trans_presets.java:2054 build/trans_presets.java:2062
+#: 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:2172 build/trans_presets.java:2178
+#: build/trans_presets.java:2184 build/trans_presets.java:2191
+#: build/trans_presets.java:2198 build/trans_presets.java:2206
+#: build/trans_presets.java:2213 build/trans_presets.java:2219
+#: build/trans_presets.java:2226 build/trans_presets.java:2232
+#: build/trans_presets.java:2238 build/trans_presets.java:2244
+#: build/trans_presets.java:2252 build/trans_presets.java:2259
+#: build/trans_presets.java:2266 build/trans_presets.java:2273
+#: build/trans_presets.java:2281 build/trans_presets.java:2313
+#: build/trans_presets.java:2318 build/trans_presets.java:2328
+#: build/trans_presets.java:2333 build/trans_presets.java:2339
+#: build/trans_presets.java:2345 build/trans_presets.java:2362
+#: build/trans_presets.java:2368 build/trans_presets.java:2374
+#: build/trans_presets.java:2380 build/trans_presets.java:2386
+#: build/trans_presets.java:2397 build/trans_presets.java:2404
+#: build/trans_presets.java:2505 build/trans_presets.java:2512
+#: build/trans_presets.java:2533 build/trans_presets.java:2541
+#: build/trans_presets.java:2546 build/trans_presets.java:2552
+#: build/trans_presets.java:2559 build/trans_presets.java:2566
+#: build/trans_presets.java:2572 build/trans_presets.java:2578
+#: build/trans_presets.java:2600 build/trans_presets.java:2607
+#: build/trans_presets.java:2614 build/trans_presets.java:2620
+#: build/trans_presets.java:2627 build/trans_presets.java:2633
+#: build/trans_presets.java:2639 build/trans_presets.java:2645
+#: build/trans_presets.java:2651 build/trans_presets.java:2657
+#: build/trans_presets.java:2664 build/trans_presets.java:2671
+#: build/trans_presets.java:2678 build/trans_presets.java:2684
+#: build/trans_presets.java:2690 build/trans_presets.java:2696
+#: build/trans_presets.java:2702 build/trans_presets.java:2708
+#: build/trans_presets.java:2715 build/trans_presets.java:2722
+#: build/trans_presets.java:2729 build/trans_presets.java:2735
+#: build/trans_presets.java:2741 build/trans_presets.java:2751
+#: build/trans_presets.java:2760 build/trans_presets.java:2775
+#: build/trans_presets.java:2781 build/trans_presets.java:2789
+#: build/trans_presets.java:2796 build/trans_presets.java:2816
+#: build/trans_presets.java:2827 build/trans_presets.java:2833
+#: build/trans_presets.java:2839 build/trans_presets.java:2845
+#: build/trans_presets.java:2851 build/trans_presets.java:2858
+#: build/trans_presets.java:2865 build/trans_presets.java:2872
+#: build/trans_presets.java:2878 build/trans_presets.java:2884
+#: build/trans_presets.java:2892 build/trans_presets.java:2899
+#: build/trans_presets.java:2906 build/trans_presets.java:2913
+#: build/trans_presets.java:2919 build/trans_presets.java:2926
+#: build/trans_presets.java:2933 build/trans_presets.java:2942
+#: build/trans_presets.java:2948 build/trans_presets.java:2954
+#: build/trans_presets.java:2960 build/trans_presets.java:2966
+#: build/trans_presets.java:2975 build/trans_presets.java:2985
+#: build/trans_presets.java:2994 build/trans_presets.java:3000
+#: build/trans_presets.java:3006 build/trans_presets.java:3011
+#: build/trans_presets.java:3017 build/trans_presets.java:3023
+#: build/trans_presets.java:3032 build/trans_presets.java:3038
+#: build/trans_presets.java:3044 build/trans_presets.java:3050
+#: build/trans_presets.java:3056 build/trans_presets.java:3062
+#: build/trans_presets.java:3068 build/trans_presets.java:3075
+#: build/trans_presets.java:3081 build/trans_presets.java:3086
+#: build/trans_presets.java:3093 build/trans_presets.java:3100
+#: build/trans_presets.java:3106 build/trans_presets.java:3115
+#: build/trans_presets.java:3123 build/trans_presets.java:3129
+#: build/trans_presets.java:3135 build/trans_presets.java:3142
+#: build/trans_presets.java:3148 build/trans_presets.java:3155
+#: build/trans_presets.java:3161 build/trans_presets.java:3167
+#: build/trans_presets.java:3173 build/trans_presets.java:3179
+#: build/trans_presets.java:3192 build/trans_presets.java:3206
+#: build/trans_presets.java:3220
 msgid "Name"
 msgstr "名稱"
@@ -6996,5 +7064,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:462
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:519
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:111
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:115
 msgid "<different>"
 msgstr "<不同>"
@@ -7047,55 +7115,55 @@
 msgstr "加入屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:808
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:809
 #, java-format
 msgid "Properties: {0} / Memberships: {1}"
 msgstr "屬性：{0} / 成員：{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:811
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:812
 msgid "Properties / Memberships"
 msgstr "屬性 / 成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:864
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
 msgid "Change relation"
 msgstr "改變關係"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:865
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:866
 msgid "Delete from relation"
 msgstr "自關係中刪除"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:867
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:868
 #, java-format
 msgid "Really delete selection from relation {0}?"
 msgstr "確定要刪除關係 {0} 的選擇區域？"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:888
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:889
 msgid "Delete the selected key in all objects"
 msgstr "刪除所有物件中選取的設定鍵"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:890
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
 msgid "Delete Properties"
 msgstr "删除屬性"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:921
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:922
 msgid "Add a new key/value pair to all objects"
 msgstr "將新的設定鍵/數值配對加入到所有的物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:933
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:934
 msgid "Edit the value of the selected key for all objects"
 msgstr "編輯所有物件選取設定鍵的數值"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:969
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
 msgid "Select relation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:970
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:971
 msgid "Select relation in main selection."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:972
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
 msgid "Select in relation list"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974
 msgid "Select relation in relation list."
 msgstr ""
@@ -7131,8 +7199,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1093
-#, fuzzy
 msgid "Conflict in data"
 msgid_plural "Conflicts in data"
-msgstr[0] "衝突發生於資料"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:345
@@ -7424,4 +7492,5 @@
 msgid_plural "You are setting an empty role on {0} primitives."
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1310
@@ -7430,7 +7499,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
-#, fuzzy
 msgid "Do you really want to apply the new role?"
-msgstr "您是否要允許這個？"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
@@ -7525,8 +7593,8 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:161
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr "警告：因為工作已取消故忽略例外。例外為： "
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:72
@@ -7546,49 +7614,49 @@
 msgstr "路徑未連接到前一個或下一個關係成員"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:105
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:110
 msgid "Bookmarks"
 msgstr "書籤"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:147
+#: ../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:149
-#, java-format
-msgid ""
-"<html><strong>Current download area</strong> (minlat,minlon, maxlat, "
-"maxlon): {0}, {1}, {2}, {3}</html>"
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
+#, fuzzy
+msgid ""
+"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
+"maxlat): </html>"
 msgstr ""
 "<html><strong>目前的下載區域</strong> (最小緯度, 經度, 最大緯度, 經度)： "
 "{0}, {1}, {2}, {3}</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:178
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
 msgid "Create bookmark"
 msgstr "建立書籤"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:180
+#: ../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:187
+#: ../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:196
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:248
+#: ../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:197
-#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:249
+#: ../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:212
+#: ../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:237
+#: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242
 msgid "Rename the currently selected bookmark"
 msgstr "重新命名目前選取的書籤"
@@ -7624,7 +7692,7 @@
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:160
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:200
-#, fuzzy, java-format
+#, java-format
 msgid "The string ''{0}'' is not a valid double value."
-msgstr "參數「{0}」不是有效的類型名稱，取得「{1}」"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:223
@@ -7713,18 +7781,18 @@
 "擇下載 OSM 資料，或 GPX 資料，或兩個都選。</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 msgid "Class Type"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:73
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ProjectionPreference.java:88
 msgid "Bounds"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgid "Near"
 msgstr "靠近"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:75
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:74
 msgctxt "placeselection"
 msgid "Zoom"
@@ -7735,34 +7803,34 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:108
+#: ../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:111
+#: ../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:147
+#: ../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:245
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:247
 msgid "Null pointer exception, possibly some missing tags."
 msgstr "空指標例外(Null pointer exception)，可能遺漏某些標籤。"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:281
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
 msgstr "搜尋 ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
 msgid "Click to start searching for places"
 msgstr "點選以開始搜尋位置"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:323
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:325
 msgid "Querying name server"
 msgstr "查詢名稱伺服器"
 
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:354
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:356
 msgid "Querying name server ..."
 msgstr "查詢名稱伺服器..."
@@ -7773,7 +7841,9 @@
 #. 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" />
@@ -7782,10 +7852,11 @@
 #. item "Land use/Wood" text "Name"
 #. item "Land use/Forest" text "Name"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:431
-#: build/trans_presets.java:379 build/trans_presets.java:661
-#: build/trans_presets.java:1009 build/trans_presets.java:1267
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
-#: build/trans_presets.java:2266 build/trans_presets.java:2808
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
+#: build/trans_presets.java:380 build/trans_presets.java:665
+#: build/trans_presets.java:674 build/trans_presets.java:1037
+#: build/trans_presets.java:1363 build/trans_presets.java:2353
+#: build/trans_presets.java:2387 build/trans_presets.java:2396
+#: build/trans_presets.java:2422 build/trans_presets.java:2976
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "Type"
 msgstr "類型"
@@ -7794,5 +7865,5 @@
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
 #. item "Ways/Dedicated Footway" combo "Bikes"
-#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:543
+#: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:93
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java:120
@@ -7804,17 +7875,16 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:347
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
 #: build/trans_presets.java:489 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1274
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
 msgid "unknown"
 msgstr "不明"
@@ -8171,5 +8241,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:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:379
 msgid "Conflicts detected"
 msgstr "選取的衝突"
@@ -8355,11 +8425,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Authenticating at the OSM API ''{0}'' failed. Please enter a valid username "
 "and a valid password."
 msgstr ""
-"<html>在 HTTP 代理伺服器「{0}」驗證失敗。請輸入有效的使用者名稱和密碼。</"
-"html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:242
@@ -8547,4 +8615,5 @@
 "changes.<br>Layers with non-writable files:</html>"
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:244
@@ -8602,4 +8671,5 @@
 "cancelled or have failed.</html>"
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:500
@@ -8622,9 +8692,9 @@
 #. item "Highways/Streets/Secondary" text "Name"
 #. item "Highways/Streets/Tertiary" text "Name"
-#. item "Highways/Streets/Unclassified" check "Embankment"
+#. 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 "Embankment"
+#. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
@@ -8634,7 +8704,7 @@
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
-#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. 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"
@@ -8646,16 +8716,16 @@
 #: build/trans_presets.java:155 build/trans_presets.java:171
 #: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:235 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:341
-#: build/trans_presets.java:387 build/trans_presets.java:402
-#: build/trans_presets.java:417 build/trans_presets.java:439
-#: build/trans_presets.java:463 build/trans_presets.java:493
+#: build/trans_presets.java:236 build/trans_presets.java:254
+#: build/trans_presets.java:272 build/trans_presets.java:290
+#: build/trans_presets.java:310 build/trans_presets.java:343
+#: build/trans_presets.java:388 build/trans_presets.java:403
+#: build/trans_presets.java:418 build/trans_presets.java:438
+#: build/trans_presets.java:462 build/trans_presets.java:493
 #: build/trans_presets.java:511 build/trans_presets.java:532
-#: build/trans_presets.java:554 build/trans_presets.java:576
-#: build/trans_presets.java:595 build/trans_presets.java:615
-#: build/trans_presets.java:934 build/trans_presets.java:942
-#: build/trans_presets.java:950 build/trans_presets.java:960
-#: build/trans_presets.java:1180
+#: build/trans_presets.java:554 build/trans_presets.java:578
+#: build/trans_presets.java:599 build/trans_presets.java:619
+#: build/trans_presets.java:954 build/trans_presets.java:962
+#: build/trans_presets.java:970 build/trans_presets.java:978
+#: build/trans_presets.java:988 build/trans_presets.java:1249
 msgid "Layer"
 msgstr "層級"
@@ -9069,68 +9139,68 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:121
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:122
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:127
 msgid "gps point"
 msgstr "gps 點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:126
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:127
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199
 msgid "Customize line drawing"
 msgstr "自訂線條的繪製"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:130
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:203
 msgid "Use global settings."
 msgstr "使用全域設定值。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:131
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:132
 #: ../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:132
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:133
 #: ../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:146
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:147
 #: ../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:163
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:164
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:236
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:199
 msgid "Customize Color"
 msgstr "自訂顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:168
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:240
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:201
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:204
 #: ../plugins/grid/src/grid/GridLayer.java:162
 msgid "Default"
 msgstr "預設值"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:172
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:173
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:244
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:208
 #: ../plugins/grid/src/grid/GridLayer.java:163
 msgid "Choose a color"
 msgstr "選擇一種顏色"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:193
 msgid "Markers From Named Points"
 msgstr "已命名點的標記"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:207
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:208
 #, java-format
 msgid "Named Trackpoints from {0}"
 msgstr "{0} 的已命名軌跡點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:215
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:216
 msgid "Import Audio"
 msgstr "匯入音效"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:219
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:220
 #, java-format
 msgid ""
@@ -9140,23 +9210,23 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:226
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:311
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:227
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:312
 msgid "Import not possible"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:248
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:249
 msgid "Wave Audio files (*.wav)"
 msgstr "Wave 音效檔案 (*.wav)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:284
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:285
 #, java-format
 msgid "Audio markers from {0}"
 msgstr "{0} 的音效標記"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:299
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:300
 msgid "Import images"
 msgstr "匯入圖片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:305
 #, java-format
 msgid ""
@@ -9166,5 +9236,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:368
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:369
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:189
 #, java-format
@@ -9172,5 +9242,5 @@
 msgstr "名稱：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:372
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:373
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:415
 #, java-format
@@ -9178,5 +9248,5 @@
 msgstr "描述：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:377
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #, java-format
 msgid "{0} track"
@@ -9186,23 +9256,23 @@
 
 #. item "Relations/Route" text "Symbol description"
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3223
 msgid "Description"
 msgstr "描述"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
 msgid "Timespan"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:380
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:381
 msgid "Length"
 msgstr "長度"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:441
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:442
 msgid "Length: "
 msgstr "長度： "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:444
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
 #, java-format
 msgid "{0} route, "
@@ -9210,5 +9280,5 @@
 msgstr[0] "{0} 路線， "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:445
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:446
 #, java-format
 msgid "{0} waypoint"
@@ -9216,10 +9286,10 @@
 msgstr[0] "{0} 航點"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:788
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:786
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:62
 msgid "Convert to data layer"
 msgstr "轉換為資料圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:794
 msgid ""
 "<html>Upload of unprocessed GPS data as map data is considered harmful."
@@ -9229,43 +9299,43 @@
 "軌跡，請看這裡："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:798
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:796
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:67
 msgid "http://www.openstreetmap.org/traces"
 msgstr "http://www.openstreetmap.org/traces"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:821
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:632
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:819
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:636
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:89
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:219
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:225
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:236
 #, java-format
 msgid "Converted from: {0}"
 msgstr "轉換自：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:843
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:869
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:965
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:841
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:963
 msgid "Download from OSM along this track"
 msgstr "從 OSM 沿這條軌跡下載"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:851
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:849
 msgid "Download everything within:"
 msgstr "下載這裡面的每個物件："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:854
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:852
 #, java-format
 msgid "{0} meters"
 msgstr "{0} 公尺"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:858
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:856
 msgid "Maximum area per request:"
 msgstr "每個要求最大區域："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:861
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:859
 #, java-format
 msgid "{0} sq km"
 msgstr "{0} 平方公里"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:957
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:955
 #, java-format
 msgid ""
@@ -9275,9 +9345,9 @@
 "<html>這個動作會發出 {0} 個<br>個別的下載要求。您是否希望<br>繼續？</html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1069
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1064
 msgid "No GPX track available in layer to associate audio with."
 msgstr "在圖層中沒有可用的 GPX 軌跡可供音效關聯。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1238
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1224
 msgid ""
 "Some waypoints with timestamps from before the start of the track or after "
@@ -9285,5 +9355,5 @@
 msgstr "部分航點的時刻戳記早於軌跡起點或晚於終點會被忽略或是移至起點。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1245
+#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1231
 msgid ""
 "Some waypoints which were too far from the track to sensibly estimate their "
@@ -9291,23 +9361,23 @@
 msgstr "部分航點離軌跡太遠而無法明顯判斷其時刻者會被忽略。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:114
 #, java-format
 msgid "Data Layer {0}"
 msgstr "資料圖層 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:180
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:182
 msgid "outside downloaded area"
 msgstr "超出下載的區域"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:262
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:264
 #, java-format
 msgid "version {0}"
 msgstr "版本 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:300
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:302
 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:334
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:336
 #, java-format
 msgid "There was {0} conflict detected."
@@ -9316,5 +9386,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:340
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:342
 #, java-format
 msgid ""
@@ -9328,5 +9398,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:349
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:351
 #, java-format
 msgid ""
@@ -9339,11 +9409,11 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:370
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:372
 msgid "Click to close this dialog and continue editing"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:507
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:512
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:517
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:509
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:514
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:519
 #, java-format
 msgid "{0} deleted"
@@ -9352,32 +9422,32 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:520
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:522
 #, java-format
 msgid "{0} consists of:"
 msgstr "{0} 組成："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 msgid "unset"
 msgstr "取消設定"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:526
 #, java-format
 msgid "API version: {0}"
 msgstr "API 版本： {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:629
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:633
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:222
 msgid "Convert to GPX layer"
 msgstr "轉換為 GPX 圖層"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:722
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:726
 msgid "Dataset consistency test"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:728
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732
 msgid "No problems found"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:731
+#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:735
 msgid "Following problems found:"
 msgstr ""
@@ -9420,28 +9490,27 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:239
-#, fuzzy
 msgid "GPS point"
-msgstr "GPS 點"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:145
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:146
 msgid "GPX Files (*.gpx *.gpx.gz)"
 msgstr "GPX 檔案 (*.gpx *.gpx.gz)"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:165
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:166
 #, java-format
 msgid "File {0} is loaded yet under the name \"{1}\""
 msgstr "檔案 {0} 已經以「{1}」的名稱載入了。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:190
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:191
 #, java-format
 msgid "Error while parsing {0}"
 msgstr "當解析 {0} 時發生錯誤。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:199
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:200
 #, java-format
 msgid "Could not read \"{0}\""
 msgstr "不能讀取 \"{0}\""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:238
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:239
 msgid ""
 "<html>Take a photo of your GPS receiver while it displays the time."
@@ -9452,34 +9521,34 @@
 "據您讀取到的相片時刻並選擇時區<hr></html>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:256
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:257
 msgid "Photo time (from exif):"
 msgstr "相片時刻 (取自 exif):"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:271
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:272
 msgid "Gps time (read from the above photo): "
 msgstr "Gps 時刻（自上列相片讀取）： "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:283
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:284
 msgid " [dd/mm/yyyy hh:mm:ss]"
 msgstr " [dd/mm/yyyy hh:mm:ss]"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:291
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:292
 msgid "I am in the timezone of: "
 msgstr "我所在的時區： "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:355
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:390
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:356
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:391
 msgid "No date"
 msgstr "沒有日期"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:364
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:365
 msgid "Open another photo"
 msgstr "開啟其他相片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:404
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:405
 msgid "Synchronize time from a photo of the GPS receiver"
 msgstr "從 GPS 接收器的相片同步時間"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:417
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:418
 msgid ""
 "Error while parsing the date.\n"
@@ -9489,64 +9558,64 @@
 "請使用要求的格式"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:419
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:420
 msgid "Invalid date"
 msgstr "無效的日期"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:464
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:465
 msgid "<No GPX track loaded yet>"
 msgstr "<尚未載入 GPX 軌跡>"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:469
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:470
 msgid "GPX track: "
 msgstr "GPX 軌跡： "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:477
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:478
 msgid "Open another GPX trace"
 msgstr "開啟另一個 GPX 軌跡"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:507
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:508
 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:512
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:513
 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:516
 msgid "Manual adjust"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:518
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:519
 msgid "Override position for: "
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:524
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:525
 #, java-format
 msgid "Images with geo location in exif data ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:528
 #, java-format
 msgid "Images that are already tagged ({0}/{1})"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:534
 msgid "Show Thumbnail images on the map"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:558
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:559
 msgid "Timezone: "
 msgstr "時區： "
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:569
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:570
 msgid "Offset:"
 msgstr "位移："
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:648
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:649
 msgid "No gpx selected"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:652
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:653
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
@@ -9554,46 +9623,47 @@
 "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
 msgstr[0] ""
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:671
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:714
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
 msgid "Correlate images with GPX track"
 msgstr "將圖片與 GPX 軌跡關聯"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:672
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:673
 msgid "Correlate"
 msgstr "關聯"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:699
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:700
 msgid "Invalid timezone"
 msgstr "無效的時區"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:707
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:708
 msgid "Invalid offset"
 msgstr "無效的移位"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:715
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
 msgid "Try Again"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:716
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:717
 msgid "No images could be matched!"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:865
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
 #, java-format
 msgid "Timezone: {0}"
 msgstr "時區：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:866
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
 #, java-format
 msgid "Minutes: {0}"
 msgstr "分鐘：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:867
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:868
 #, java-format
 msgid "Seconds: {0}"
 msgstr "秒鐘：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:885
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:886
 #, java-format
 msgid "(Time difference of {0} day)"
@@ -9602,5 +9672,5 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:912
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:913
 msgid ""
 "An error occurred while trying to match the photos to the GPX track. You can "
@@ -9608,21 +9678,21 @@
 msgstr "在試著比對相片與 GPX 軌跡時發生錯誤。您可以使用滑動鈕來手動比對相片。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:914
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:915
 msgid "Matching photos to track failed"
 msgstr "比對相片至軌跡失敗"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:930
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:931
 msgid "Adjust timezone and offset"
 msgstr "調整時區並補償"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:950
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
 msgid "The selected photos do not contain time information."
 msgstr "選取的相片未包含時刻資訊。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:951
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:952
 msgid "Photos do not contain time information"
 msgstr "相片未包含時刻資訊"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:979
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
 msgid ""
 "The selected GPX track does not contain timestamps. Please select another "
@@ -9630,17 +9700,17 @@
 msgstr "選取的 GPX 軌跡沒有包含時間戳記。請選擇另一個。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:980
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:981
 msgid "GPX Track has no time information"
 msgstr "GPX 軌跡沒有時刻資訊"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1075
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
 msgid "You should select a GPX track"
 msgstr "您應該選擇一個 GPX 軌跡"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1076
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1077
 msgid "No selected GPX track"
 msgstr "沒有選取的 GPX 軌跡"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1249
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1250
 #, java-format
 msgid ""
@@ -9651,5 +9721,5 @@
 "預期的格式：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1319
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1320
 #, java-format
 msgid ""
@@ -9660,73 +9730,75 @@
 "預期的格式：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:104
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:106
 msgid "Extracting GPS locations from EXIF"
 msgstr "從 EXIF 中解出 GPS 位置"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:112
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:114
 msgid "Starting directory scan"
 msgstr "開始掃描目錄"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:117
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:119
 msgid "One of the selected files was null"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:122
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:125
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:124
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:127
 msgid "Read photos..."
 msgstr "讀取相片..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:137
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:139
 #, java-format
 msgid "Reading {0}..."
 msgstr "正在讀取 {0}..."
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:176
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:178
 #, 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:188
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:190
 #, java-format
 msgid "Scanning directory {0}"
 msgstr "正在掃描目錄 {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:193
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:195
 #, java-format
 msgid "Found null file in directory {0}\n"
 msgstr "在目錄 {0} 找到空的檔案\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:196
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:198
 #, java-format
 msgid "Error while getting files from directory {0}\n"
 msgstr "從目錄 {0} 取得檔案時發生錯誤\n"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:280
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:282
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:64
 msgid "Geotagged Images"
 msgstr "有 Geotag 的圖片"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:301
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:306
 msgid "Correlate to GPX"
 msgstr "關聯到 GPX"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:320
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:331
+#, java-format
 msgid "{0} image loaded."
 msgid_plural "{0} images loaded."
-msgstr[0] "沒有載入資料。"
-
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:321
-#, fuzzy, java-format
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:332
+#, 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:585
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:605
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:106
 msgid "Delete image file from disk"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:588
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:608
 #, java-format
 msgid ""
@@ -9735,5 +9807,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:613
+#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:633
 msgid "Image file could not be deleted."
 msgstr ""
@@ -9830,10 +9902,10 @@
 msgstr "gps 標記"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:173
+#: ../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:192
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:195
 #, java-format
 msgid "{0} consists of {1} marker"
@@ -9841,29 +9913,29 @@
 msgstr[0] "{0} 由 {1} 標記組成"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:226
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:229
 msgid "Synchronize Audio"
 msgstr "同步音效"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:233
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
 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:243
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:250
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
+#: ../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:250
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:259
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:253
+#: ../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:258
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:261
 msgid "Make Audio Marker at Play Head"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:265
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
 msgid ""
 "You need to have paused audio at the point on the track where you want the "
@@ -9871,17 +9943,17 @@
 msgstr "您需要在軌跡上想標記的點暫停音效。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:344
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:347
 msgid "No existing audio markers in this layer to offset from."
 msgstr "這個圖層中沒有既存的音效標記可位移。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:452
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:455
 msgid "Show/Hide Text/Icons"
 msgstr "顯示/隱藏文字/圖示"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:453
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:456
 msgid "Toggle visible state of the marker text and icons."
 msgstr "切換標記文字和圖示的可見性狀態。"
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:171
+#: ../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 "
@@ -9889,5 +9961,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:226
+#: ../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 "
@@ -9895,5 +9967,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:241
+#: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:240
 msgid "Unable to create new audio marker."
 msgstr "無法建立新的音效標記。"
@@ -9919,15 +9991,15 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:91
-#, fuzzy, java-format
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:101
+#, java-format
 msgid ""
 "Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr "基於安全性的理由無法從「{0}」載入書籤。例外為：{1}"
-
-#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:94
-#, fuzzy, java-format
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:104
+#, java-format
 msgid ""
 "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr "基於安全性的理由無法從「{0}」載入書籤。例外為：{1}"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
@@ -9975,8 +10047,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:101
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:236
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize URL:"
-msgstr "作者"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125
@@ -10066,8 +10136,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:333
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:305
-#, fuzzy
-#| msgid "Author"
 msgid "Authorize now"
-msgstr "作者"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:335
@@ -10126,7 +10194,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:480
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:505
-#, fuzzy
 msgid "OAuth authorization failed"
-msgstr "驗證"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:472
@@ -10206,8 +10273,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:121
-#, fuzzy
-#| msgid "Please select at least four nodes."
 msgid "Please select an authorization procedure: "
-msgstr "請選取至少四個節點"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:239
@@ -10217,8 +10282,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:340
-#, fuzzy
-#| msgid "Close dialog and cancel downloading"
 msgid "Close the dialog and cancel authorization"
-msgstr "關閉對話盒並取消下載"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:359
@@ -10531,5 +10594,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:221
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:193
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:664
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:667
 msgid "Please select the row to edit."
 msgstr "請選擇要編輯的列。"
@@ -10543,5 +10606,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:246
 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:140
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:687
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:690
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPreferenceEditor.java:100
 msgid "Please select the row to delete."
@@ -10678,9 +10741,4 @@
 msgstr "繪畫樣式 {0}：{1}"
 
-#: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:142
-#, java-format
-msgid "Layer: {0}"
-msgstr "圖層：{0}"
-
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152
 msgid "Choose"
@@ -10710,6 +10768,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:36
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:107
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:257
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:260
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:286
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:278
 msgid "All"
 msgstr "全部"
@@ -10748,8 +10806,8 @@
 msgstr "單一顏色（可以為已命名的圖層自訂）"
 
-#. item "Aerialway/Station" text "Name"
+#. item "Aerialway/Pylon" text "Name"
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:1328
 msgid "Car"
 msgstr "汽車"
@@ -10771,13 +10829,13 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:354 build/trans_presets.java:487
-#: build/trans_presets.java:730 build/trans_presets.java:749
-#: build/trans_presets.java:763 build/trans_presets.java:785
-#: build/trans_presets.java:822 build/trans_presets.java:835
-#: build/trans_presets.java:847 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:893 build/trans_presets.java:902
-#: build/trans_presets.java:911 build/trans_presets.java:1305
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:357 build/trans_presets.java:487
+#: build/trans_presets.java:750 build/trans_presets.java:769
+#: build/trans_presets.java:783 build/trans_presets.java:805
+#: build/trans_presets.java:842 build/trans_presets.java:855
+#: build/trans_presets.java:867 build/trans_presets.java:879
+#: build/trans_presets.java:891 build/trans_presets.java:903
+#: build/trans_presets.java:913 build/trans_presets.java:922
+#: build/trans_presets.java:931 build/trans_presets.java:1401
+#: build/trans_presets.java:1467
 msgid "Bicycle"
 msgstr "單車"
@@ -10810,12 +10868,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:355 build/trans_presets.java:486
-#: build/trans_presets.java:729 build/trans_presets.java:748
-#: build/trans_presets.java:762 build/trans_presets.java:784
-#: build/trans_presets.java:821 build/trans_presets.java:834
-#: build/trans_presets.java:846 build/trans_presets.java:858
-#: build/trans_presets.java:870 build/trans_presets.java:882
-#: build/trans_presets.java:892 build/trans_presets.java:901
-#: build/trans_presets.java:910
+#: build/trans_presets.java:358 build/trans_presets.java:486
+#: build/trans_presets.java:749 build/trans_presets.java:768
+#: build/trans_presets.java:782 build/trans_presets.java:804
+#: build/trans_presets.java:841 build/trans_presets.java:854
+#: build/trans_presets.java:866 build/trans_presets.java:878
+#: build/trans_presets.java:890 build/trans_presets.java:902
+#: build/trans_presets.java:912 build/trans_presets.java:921
+#: build/trans_presets.java:930
 msgid "Foot"
 msgstr "步行"
@@ -11150,5 +11208,4 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
-#, fuzzy
 msgid ""
 "<p>You may notice that the key selection list on the next page lists all "
@@ -11164,11 +11221,4 @@
 "keyboard...</p>"
 msgstr ""
-"<p>您可能會注意到下一頁的按鍵選擇清單列出了所有 Java 認識的按鍵，而不只是在您"
-"鍵盤上的按鍵。請只使用確實能對應到您鍵盤上實際按鍵的數值。因此如果您的鍵盤沒"
-"有「Copy」按鍵 （PC 鍵盤沒有它們，Sun 鍵盤才有），就不要使用它。同時有些列出"
-"來的「按鍵」對應到您鍵盤上的特殊鍵（如 ':'/冒號）。也請不要使用它們，而要使用"
-"其基底按鍵（US 鍵盤是 ';'/分號，德國鍵盤是 '.'/句點，...）來代替。不照這個規"
-"則做可能會造成衝突，因為 JOSM 無法了解 Ctrl+Shift+; 和 Ctrl+: 在 US 鍵盤上是"
-"相同的情形...</p>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177
@@ -11758,4 +11808,6 @@
 "JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
 msgstr ""
+"警告：JOSM 是設定為使用系統設定的代理伺服器，但是 JVM 並未設定為可以取得它"
+"們。將偏好設定重設為「不使用代理伺服器」"
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:69
@@ -11779,5 +11831,12 @@
 msgstr "刪除在標籤表中的選擇區域"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:454
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:338
+#, java-format
+msgid ""
+"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
+"be the same as in values"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:464
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:313
 msgid "More information about this feature"
@@ -11785,18 +11844,18 @@
 
 #. space
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:477
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:487
 msgid "Optional Attributes:"
 msgstr "額外屬性："
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:568
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:578
 msgid "closedway"
 msgstr "封閉路徑"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:573
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:583
 #, java-format
 msgid "Unknown type: {0}"
 msgstr "不明的類型：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:652
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:666
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:60
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/preset/Presets.java:63
@@ -11807,16 +11866,16 @@
 msgstr "無法讀取標籤預設組合來源：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:660
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:674
 #, java-format
 msgid "Error parsing {0}: "
 msgstr "分析 {0} 時發生錯誤： "
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:690
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:705
 #, java-format
 msgid "Elements of type {0} are supported."
 msgstr "類型 {0} 的元件已支援。"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:731
-#: ../plugins/terracer/src/terracer/TerracerAction.java:76
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:768
+#: ../plugins/terracer/src/terracer/TerracerAction.java:146
 #, java-format
 msgid "Change {0} object"
@@ -11824,18 +11883,17 @@
 msgstr[0] "改變 {0} 個物件"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:734
-#: ../plugins/terracer/src/terracer/TerracerAction.java:79
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:771
 msgid "Nothing selected!"
 msgstr "尚未選擇！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:736
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:773
 msgid "Selection unsuitable!"
 msgstr "選擇區域不合適！"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:744
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:781
 msgid "Apply Preset"
 msgstr "套用預設組合"
 
-#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:819
+#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:856
 msgid "Change Properties"
 msgstr "改變屬性"
@@ -12111,6 +12169,6 @@
 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:62
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:34
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:87
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:84
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:88
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:85
 #: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:129
 #, java-format
@@ -12135,9 +12193,9 @@
 msgstr "分析檔案「{0}」失敗"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:336
+#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:339
 msgid "Parse error: invalid document structure for GPX document."
 msgstr "分析錯誤：gpx 文件有無效的文件結構"
 
-#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:245
+#: ../core/src/org/openstreetmap/josm/io/GpxWriter.java:246
 #, java-format
 msgid "Unknown mode {0}."
@@ -12153,7 +12211,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:38
-#, fuzzy
 msgid "Looking for image files"
-msgstr "尋找海岸線..."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:48
@@ -12161,8 +12218,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:56
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:59
 #, java-format
 msgid "Failed to open input stream for resource ''{0}''"
 msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:97
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:152
+#, fuzzy, java-format
+msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
+msgstr "讀取 CSS 檔案 ''help-browser.css'' 失敗。例外為：{0}"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
@@ -12233,5 +12296,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:44
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Coordinates imported: "
 msgstr "匯入的坐標： "
@@ -12332,8 +12395,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:424
-#, fuzzy, java-format
+#, java-format
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "正在上傳 {0} 個物件..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:445
@@ -12859,8 +12923,9 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:159
-#, fuzzy, java-format
+#, java-format
 msgid "({0}/{1}) Uploading {2} object..."
 msgid_plural "({0}/{1}) Uploading {2} objects..."
-msgstr[0] "正在上傳 {0} 個物件..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:186
@@ -12946,7 +13011,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:194
-#, fuzzy
 msgid "Click to update the activated plugins"
-msgstr "點選以關閉對話盒"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:198
@@ -12959,5 +13023,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:238
-#, fuzzy, java-format
+#, java-format
 msgid ""
 "Plugin {0} requires a plugin which was not found. The missing plugin is:"
@@ -12965,5 +13029,6 @@
 "Plugin {0} requires {1} plugins which were not found. The missing plugins "
 "are:"
-msgstr[0] "外掛程式 {1} 要求 外掛程式 {0} 但是找不到。"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:260
@@ -13035,4 +13100,5 @@
 "them manually."
 msgstr[0] ""
+msgstr[1] ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:567
@@ -13047,7 +13113,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:625
-#, fuzzy, java-format
+#, java-format
 msgid "Click to delete the plugin ''{0}''"
-msgstr "點選以關閉對話盒"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:629
@@ -13083,7 +13149,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:718
-#, fuzzy, java-format
+#, java-format
 msgid "Click to disable the plugin ''{0}''"
-msgstr "點選以關閉對話盒"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:731
@@ -13127,7 +13193,7 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:69
-#, fuzzy, java-format
+#, java-format
 msgid "The plugin file ''{0}'' does not include a Manifest."
-msgstr "檔案「{0}」不存在"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:181
@@ -13224,5 +13290,4 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:64
-#, fuzzy
 msgid ""
 "An unexpected exception occurred.<br>This is always a coding error. If you "
@@ -13230,8 +13295,4 @@
 "file a bug report."
 msgstr ""
-"發生未預期的例外。\n"
-"\n"
-"這常常是程式編寫的錯誤。如果您執行的是\n"
-"最新版 JOSM，請不吝提供程式錯誤回報。"
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69
@@ -13323,6 +13384,6 @@
 #, java-format
 msgid ""
-"<html>Authorization at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorized to access the protected resource<br>''{1}''."
+"<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>"
@@ -13438,6 +13499,6 @@
 msgstr "找不到地區設定 {0} 的翻譯檔。回復為 {1}。"
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:168
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:182
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:204
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:218
 #, java-format
 msgid ""
@@ -13446,5 +13507,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:202
+#: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:238
 #, java-format
 msgid ""
@@ -13592,4 +13653,5 @@
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
+#: build/trans_presets.java:485
 msgid "Visibility"
 msgstr "可見狀態"
@@ -13680,5 +13742,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:2146
+#: build/trans_presets.java:2301
 msgid "Address Interpolation"
 msgstr ""
@@ -14262,5 +14324,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:44
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "Location"
 msgstr "位置"
@@ -14425,21 +14487,21 @@
 "在分離它之前請先將區域自關係中移除。"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:35
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:38
 msgid "TangoGPS Files (*.log)"
 msgstr "TangoGPS 檔案 (*.log)"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:113
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:114
 msgid "Format errors: "
 msgstr "格式錯誤： "
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:115
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:116
 msgid "TangoGPS import success"
 msgstr "TangoGPS 匯入成功"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:117
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/TangoGPS.java:118
 msgid "TangoGPS import failure!"
 msgstr "TangoGPS 匯入失敗！"
 
-#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:67
+#: ../plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/io/Tcx.java:68
 msgid "TCX Files (*.tcx)"
 msgstr "TCX 檔案 (*.tcx)"
@@ -14471,9 +14533,9 @@
 msgstr "建立重複的路徑"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:94
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:99
 msgid "Layer for editing GPX tracks"
 msgstr "編輯 GPX 軌跡的圖層"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:216
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:233
 msgid "Convert to GPX layer with anonymised time"
 msgstr "轉換為沒有時刻的 GPX 圖層"
@@ -14488,13 +14550,13 @@
 
 #. TODO what is icon at the end?
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:51
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:101
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:259
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:303
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:52
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:102
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:260
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:304
 msgid "Import path from GPX layer"
 msgstr "從 GPX 圖層匯入路徑"
 
-#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:91
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:293
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:92
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:294
 msgid "Drop existing path"
 msgstr ""
@@ -14503,6 +14565,6 @@
 #. 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:132
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:329
+#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/GPXLayerImportAction.java:133
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:330
 msgid "No GPX data layer found."
 msgstr "找不到 GPX 資料圖層。"
@@ -14730,17 +14792,17 @@
 msgstr "將多組圖片載入為新的圖層。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:78
+#: ../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:109
+#: ../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:114
+#: ../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:146
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java:137
 #, java-format
 msgid "{0} nodes so far..."
@@ -14784,42 +14846,41 @@
 msgstr "正在移除重複的節點..."
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java:286
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerReader.java:114
+#: ../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:10
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:7
 msgid "An unknown error has occurred"
 msgstr "發生不明的錯誤"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "east"
 msgstr "東"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northeast"
 msgstr "東北"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "north"
 msgstr "北"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:19
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
 msgid "northwest"
 msgstr "西北"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "west"
 msgstr "西"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southwest"
 msgstr "西南"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "south"
 msgstr "南"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:20
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:21
 msgid "southeast"
 msgstr "東南"
@@ -14875,6 +14936,6 @@
 #. <condition k="natural" v="coastline"/>
 #. <icon src="misc/no_icon.png"/>
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
-#: build/trans_presets.java:2198 build/trans_style.java:993
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
+#: build/trans_presets.java:2353 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -14883,73 +14944,73 @@
 msgstr "水域"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "coastline"
 msgstr "海岸線"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:22
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
 msgid "land"
 msgstr "陸地"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:41
+#: ../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:43
+#: ../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:45
+#: ../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:47
+#: ../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:49
+#: ../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:51
+#: ../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:53
+#: ../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:55
+#: ../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:57
+#: ../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:59
+#: ../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:61
+#: ../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:63
+#: ../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:65
+#: ../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:67
+#: ../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:70
+#: ../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:71
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
 msgid ""
 "Maximum number of nodes to generate before bailing out (before simplifying "
@@ -14957,5 +15018,5 @@
 msgstr ""
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
+#: ../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 "
@@ -14965,5 +15026,5 @@
 "為 90。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
 msgid ""
 "Accuracy of Douglas-Peucker line simplification, measured in degrees."
@@ -14973,58 +15034,58 @@
 "節點，和更準確的線條。預設值為 0.0003。"
 
-#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
+#: ../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:75
+#: ../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:76
+#: ../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:77
+#: ../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:78
+#: ../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:79
+#: ../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:80
+#: ../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:81
+#: ../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:82
+#: ../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:83
+#: ../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:85
+#: ../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:86
+#: ../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:48
+#: ../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:151
+#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java:153
 msgid "Could not acquire image"
 msgstr "無法擷取圖片"
@@ -15048,5 +15109,5 @@
 msgstr "連線失敗"
 
-#: ../plugins/livegps/src/livegps/LiveGpsData.java:130
+#: ../plugins/livegps/src/livegps/LiveGpsData.java:129
 msgid "no name"
 msgstr "沒有名稱"
@@ -15077,5 +15138,5 @@
 msgstr "道路"
 
-#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:25
+#: ../plugins/livegps/src/livegps/LiveGpsLayer.java:26
 msgid "LiveGPS layer"
 msgstr "LiveGPS 圖層"
@@ -15149,5 +15210,5 @@
 msgstr "兩個已取選節點間的角度"
 
-#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:61
+#: ../plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java:62
 msgid "Layer to make measurements"
 msgstr "要進行測量的圖層"
@@ -15411,4 +15472,76 @@
 msgid "Firefox executable"
 msgstr "Firefox 可執行檔"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:39
+#, fuzzy
+msgid "Read error!"
+msgstr "貯水處"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/ExifGPSTagger.java:41
+msgid "Write error!"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:63
+#, fuzzy
+msgid "Write coordinates to image header"
+msgstr "輸入新節點的座標"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:84
+msgid "Write position information into the exif header of the following files:"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:99
+#, fuzzy
+msgid "keep backup files"
+msgstr "保留備份檔案"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:104
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:134
+msgid "Photo Geotagging Plugin"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:140
+msgid "Writing position information to image files..."
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:163
+#, fuzzy
+msgid "Error: "
+msgstr "錯誤"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:195
+#, fuzzy
+msgid "File could not be deleted!"
+msgstr "輸入的時刻無法解析。"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:202
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:216
+#, fuzzy
+msgid "Could not rename file!"
+msgstr "無法重新命名檔案「{0}」"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:225
+msgid "<html><h3>There are old backup files in the image directory!</h3>"
+msgstr ""
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:229
+#, fuzzy
+msgid "Override old backup files?"
+msgstr "保留備份檔案"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Keep old backups and continue"
+msgstr "保留備份檔案"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:230
+#, fuzzy
+msgid "Override"
+msgstr "覆寫"
+
+#: ../plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingPlugin.java:251
+#, fuzzy
+msgid "Could not delete temporary file!"
+msgstr "找不到元件類型"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerPlugin.java:65
@@ -15683,6 +15816,6 @@
 msgstr "每分鐘把取得的資料儲存為檔案。"
 
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveEditLayerTimerTask.java:67
-#: ../plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:85
+#: ../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}"
@@ -15803,72 +15936,129 @@
 msgstr "您必須先在偏好設定中指定標籤預設組合來源。"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:258
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:61
+msgid "Enter housenumbers or amount of segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:100
+#, fuzzy
+msgid "Terrace a house"
+msgstr "將建築連棟"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:140
+msgid "Interpolation"
+msgstr "插入補間"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:92
+msgid "Segments"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:144
+#, fuzzy
+msgid "Street"
+msgstr "街道"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:146
+#, fuzzy
+msgid "Highest Number"
+msgstr "最高編號"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:148
+#, fuzzy
+msgid "Lowest Number"
+msgstr "最低編號"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:150
+#, fuzzy
+msgid "Lowest housenumber of the terraced house"
+msgstr "反轉在連棟建築中房屋的編號。"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+msgid "add to existing associatedStreet relation"
+msgstr ""
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:151
+#, fuzzy
+msgid "create an associatedStreet relation"
+msgstr "建立新的關係"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:153
+#, fuzzy
+msgid "delete outline way"
+msgstr "建立重複的路徑"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:169
+#, fuzzy
+msgid "Street name: "
+msgstr "街道名稱"
+
+#: ../plugins/terracer/src/terracer/HouseNumberInputDialog.java:287
 msgid "Even/Odd"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:78
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:86
 msgid "Lowest number"
 msgstr "最低編號"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:81
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:89
 msgid "Highest number"
 msgstr "最高編號"
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:84
-msgid "Segments"
-msgstr ""
-
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:114
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:142
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
 msgid "Housenumbers do not match odd/even setting"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:167
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:175
 msgid "Segment must be a number greater 1"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:191
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:199
 #, java-format
 msgid "{0} must be greater than 0"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:196
+#: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:204
 #, java-format
 msgid "{0} is not a number"
 msgstr ""
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:35
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:38
 msgid "Reverse a terrace"
 msgstr "反轉一排連棟建築"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:37
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
 msgid "Reverses house numbers on a terrace."
 msgstr "反轉在連棟建築中房屋的編號。"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:39
+#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:42
 msgid "Reverse a Terrace"
 msgstr "反轉一排連棟建築"
 
-#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:110
+#: ../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:53
-#: ../plugins/terracer/src/terracer/TerracerAction.java:56
+#: ../plugins/terracer/src/terracer/TerracerAction.java:61
+#: ../plugins/terracer/src/terracer/TerracerAction.java:64
 msgid "Terrace a building"
 msgstr "將建築連棟"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:54
+#: ../plugins/terracer/src/terracer/TerracerAction.java:62
 msgid "Creates individual buildings from a long building."
 msgstr "從一長排建築中建立個別建築。"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:96
+#: ../plugins/terracer/src/terracer/TerracerAction.java:124
 msgid "Select a single, closed way of at least four nodes."
 msgstr "選擇至少有四個節點的單一、封閉的路徑。"
 
-#: ../plugins/terracer/src/terracer/TerracerAction.java:185
+#: ../plugins/terracer/src/terracer/TerracerAction.java:258
 msgid "Terrace"
 msgstr "連棟建築"
@@ -16101,5 +16291,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:52
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:187
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:199
 msgid "Duplicated nodes"
 msgstr "重複的節點"
@@ -16109,5 +16299,5 @@
 msgstr "這會測試有沒有位置非常相近的節點存在。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:144
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:156
 msgid ""
 "You are about to delete nodes outside of the area you have downloaded."
@@ -16118,9 +16308,9 @@
 "看到的）可能會使用它們。<br>確定要刪除嗎？"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:149
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:161
 msgid "Confirmation"
 msgstr ""
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:208
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:220
 msgid "Nodes at same position"
 msgstr ""
@@ -16155,5 +16345,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:25
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3185
 msgid "Multipolygon"
 msgstr ""
@@ -16300,7 +16490,7 @@
 "{0}"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:429
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:430
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:439
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:432
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:433
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:442
 msgid "Illegal tag/value combinations"
 msgstr "不合法的標籤/數值組合"
@@ -16308,80 +16498,80 @@
 #. passing translated text also to original string, as we already
 #. translated the stuff before. Makes the ignore file language dependend.
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:454
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:457
 msgid "Painting problem"
 msgstr "繪圖問題"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:464
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:467
 #, java-format
 msgid "Key ''{0}'' invalid."
 msgstr "設定鍵「{0}」無效。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:469
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:472
 msgid "Tags with empty values"
 msgstr "標籤沒有數值"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:475
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:478
 msgid "Invalid property key"
 msgstr "無效的屬性設定鍵"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:481
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:484
 msgid "Invalid white space in property key"
 msgstr "屬性設定鍵中有無效的空白字元"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:487
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:490
 msgid "Property values start or end with white space"
 msgstr "屬性數值以空白字元開頭或結尾"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:493
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:496
 msgid "Property values contain HTML entity"
 msgstr "屬性數值含有 HTML 標記"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:520
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:523
 #, java-format
 msgid "Key ''{0}'' not in presets."
 msgstr "設定鍵「{0}」不在預設組合裡。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:521
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:524
 msgid "Presets do not contain property key"
 msgstr "預設組合不包含屬性設定鍵"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:543
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:546
 #, java-format
 msgid "Value ''{0}'' for key ''{1}'' not in presets."
 msgstr "設定鍵「{1}」的數值「{0}」不在預設組合中。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:544
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:547
 msgid "Presets do not contain property value"
 msgstr "預設組合不包含屬性數值"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:556
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:559
 msgid "FIXMES"
 msgstr "FIXMES"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:603
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:606
 msgid "Check property keys."
 msgstr "檢查屬性設定鍵。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:604
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:607
 msgid "Validate that property keys are valid checking against list of words."
 msgstr "檢查文字清單以驗證屬性設定鍵是有效的。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:611
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:614
 msgid "Use complex property checker."
 msgstr "使用複雜的屬性檢查器。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:612
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:615
 msgid "Validate property values and tags using complex rules."
 msgstr "使用複雜的規則驗證屬性數值。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:633
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:634
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:656
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:672
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:673
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:636
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:637
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:659
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:675
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:676
 msgid "TagChecker source"
 msgstr "標籤檢查器來源"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:696
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
 msgid ""
 "The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
@@ -16391,86 +16581,86 @@
 "openstreetmap.org/index.php/User:JLS/speller）"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:697
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:700
 msgid "Add a new source to the list."
 msgstr "將新的來源加入清單。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:698
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
 msgid "Edit the selected source."
 msgstr "編輯選取的來源。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:699
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:702
 msgid "Delete the selected source from the list."
 msgstr "從清單刪除選取的來源。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:701
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:704
 msgid "Data sources"
 msgstr "資料來源"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:721
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:724
 msgid "Check property values."
 msgstr "檢查屬性數值。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:722
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:725
 msgid "Validate that property values are valid checking against presets."
 msgstr "驗證屬性數值合於預設組合的要求。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:729
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:732
 msgid "Check for FIXMES."
 msgstr "檢查 FIXMES。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:730
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733
 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:737
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740
 msgid "Check for paint notes."
 msgstr "檢查繪圖筆記。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:738
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:741
 msgid "Check if map painting found data errors."
 msgstr "檢查地圖繪製是否發現資料錯誤。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:745
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:748
 msgid "Use default data file."
 msgstr "使用預設的資料檔案。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:746
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
 msgid "Use the default data file (recommended)."
 msgstr "使用預設的資料檔案（建議值）。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:749
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:752
 msgid "Use default tag ignore file."
 msgstr "使用預設標籤忽略檔案。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:750
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
 msgid "Use the default tag ignore file (recommended)."
 msgstr "使用預設標籤忽略檔案（建議值）。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:753
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:756
 msgid "Use default spellcheck file."
 msgstr "使用預設的拼字檢查檔案。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:754
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:757
 msgid "Use the default spellcheck file (recommended)."
 msgstr "使用預設的拼字檢查檔案（建議值）。"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:848
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:851
 msgid "Fix properties"
 msgstr "修正屬性"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:969
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Could not find element type"
 msgstr "找不到元件類型"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:986
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:989
 msgid "Could not find warning level"
 msgstr "找不到警告等級"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:995
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:998
 #, java-format
 msgid "Illegal expression ''{0}''"
 msgstr "不合法的辭句「{0}」"
 
-#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:999
+#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:1002
 #, java-format
 msgid "Illegal regular expression ''{0}''"
@@ -16912,5 +17102,5 @@
 msgstr "WMS 圖層 ({0})，於縮放 {1} 下載"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:201
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
 msgid ""
@@ -16921,63 +17111,63 @@
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:209
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:214
 msgid "Yes, fetch images"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:220
 msgid "Invalid URL?"
 msgstr ""
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:238
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:306
+msgid "Download visible tiles"
+msgstr "下載可見的拼貼"
+
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
 msgid ""
 "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr "要求的區域太大。請拉近一點，或是改變解析度"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:309
-msgid "Download visible tiles"
-msgstr "下載可見的拼貼"
-
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:318
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:324
 msgid "Change resolution"
 msgstr "改變解析度"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:330
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:336
 msgid "Reload erroneous tiles"
 msgstr "重新載入錯誤的拼貼"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:354
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:360
 msgid "Alpha channel"
 msgstr "透明色版"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:374
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:380
 msgid "Save WMS layer to file"
 msgstr "將 WMS 圖層儲存為檔案"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:378
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:384
 msgid "Save WMS layer"
 msgstr "儲存 WMS 圖層"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:402
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:408
 msgid "Load WMS layer from file"
 msgstr "從檔案載入 WMS 圖層"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:406
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:412
 msgid "Load WMS layer"
 msgstr "載入 WMS 圖層"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:417
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:423
 #, java-format
 msgid "Unsupported WMS file version; found {0}, expected {1}"
 msgstr "不支援的 WMS 檔案版本；發現 {0}，應為 {1}"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:418
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:424
 msgid "File Format Error"
 msgstr "檔案格式錯誤"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:438
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:444
 msgid "Error loading file"
 msgstr "載入檔案有錯誤"
 
-#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:451
+#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
 msgstr ""
@@ -17241,6 +17431,13 @@
 msgstr "執行 FireFox 將目前可見的畫面顯示為很好的 SVG 圖片。"
 
+#. Plugin photo_geotagging
+#: build/trans_plugins.java:49
+msgid ""
+"Write gps position info to the image file header. Run this feature from the "
+"right click menu of the image layer."
+msgstr ""
+
 #. Plugin PicLayer
-#: build/trans_plugins.java:49
+#: build/trans_plugins.java:51
 msgid ""
 "This plugin allows to display any picture as a background in the editor and "
@@ -17249,15 +17446,15 @@
 
 #. Plugin plastic_laf
-#: build/trans_plugins.java:51
+#: build/trans_plugins.java:53
 msgid "The great JGoodies Plastic Look and Feel."
 msgstr "超棒的 JGoodies 塑膠外觀與感覺。"
 
 #. Plugin remotecontrol
-#: build/trans_plugins.java:53
+#: build/trans_plugins.java:55
 msgid "Let other applications send commands to JOSM."
 msgstr "讓其他的應用程式傳送指令給 JOSM。"
 
 #. Plugin routes
-#: build/trans_plugins.java:55
+#: build/trans_plugins.java:57
 msgid ""
 "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
@@ -17266,10 +17463,10 @@
 
 #. Plugin routing
-#: build/trans_plugins.java:57
+#: build/trans_plugins.java:59
 msgid "Provides routing capabilities."
 msgstr "提供路線規畫的功能。"
 
 #. Plugin slippymap
-#: build/trans_plugins.java:59
+#: build/trans_plugins.java:61
 msgid ""
 "Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
@@ -17279,15 +17476,15 @@
 
 #. Plugin surveyor
-#: build/trans_plugins.java:61
+#: build/trans_plugins.java:63
 msgid "Allow adding markers/nodes on current gps positions."
 msgstr "允許在目前的 gps 位置加入標記/節點。"
 
 #. Plugin tageditor
-#: build/trans_plugins.java:63
+#: build/trans_plugins.java:65
 msgid "Provides a dialog for editing tags in a tabular grid."
 msgstr "提供在表格線中編輯標籤的對話盒。"
 
 #. Plugin tagging-preset-tester
-#: build/trans_plugins.java:65
+#: build/trans_plugins.java:67
 msgid ""
 "Adds a tagging preset tester to the help menu, which helps you developing of "
@@ -17299,10 +17496,10 @@
 
 #. Plugin terracer
-#: build/trans_plugins.java:67
+#: build/trans_plugins.java:69
 msgid "Make terraced houses out of single blocks."
 msgstr "讓連棟房屋能超出單一區塊。"
 
 #. Plugin validator
-#: build/trans_plugins.java:69
+#: build/trans_plugins.java:71
 msgid ""
 "An OSM data validator. It checks for problems in data, and provides fixes "
@@ -17313,5 +17510,5 @@
 
 #. Plugin walkingpapers
-#: build/trans_plugins.java:71
+#: build/trans_plugins.java:73
 msgid ""
 "Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -17320,10 +17517,10 @@
 
 #. Plugin waydownloader
-#: build/trans_plugins.java:73
+#: build/trans_plugins.java:75
 msgid "Easy downloading along a long set of interconnected ways"
 msgstr "方便的下載一整組互相聯結的路徑"
 
 #. Plugin wmsplugin
-#: build/trans_plugins.java:75
+#: build/trans_plugins.java:77
 msgid ""
 "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
@@ -17430,6 +17627,15 @@
 #. <space />
 #. <key key="highway" value="tertiary" />
-#. item "Public Transport/Airport" text "Name"
+#. 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"
@@ -17437,6 +17643,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1421 build/trans_presets.java:2250
-#: build/trans_presets.java:3053
+#: build/trans_presets.java:1529 build/trans_presets.java:1537
+#: build/trans_presets.java:1545 build/trans_presets.java:1579
+#: build/trans_presets.java:2406 build/trans_presets.java:3221
 msgid "Reference"
 msgstr "道路編號"
@@ -17453,5 +17660,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:388
+#: build/trans_presets.java:193 build/trans_presets.java:389
 msgid "Lanes"
 msgstr "車道數"
@@ -17473,10 +17680,10 @@
 #: build/trans_presets.java:157 build/trans_presets.java:173
 #: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:236 build/trans_presets.java:310
-#: build/trans_presets.java:343 build/trans_presets.java:364
-#: build/trans_presets.java:403 build/trans_presets.java:418
-#: build/trans_presets.java:442 build/trans_presets.java:494
-#: build/trans_presets.java:513 build/trans_presets.java:597
-#: build/trans_presets.java:617 build/trans_presets.java:1182
+#: build/trans_presets.java:237 build/trans_presets.java:312
+#: build/trans_presets.java:345 build/trans_presets.java:365
+#: build/trans_presets.java:404 build/trans_presets.java:419
+#: build/trans_presets.java:441 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:601
+#: build/trans_presets.java:621 build/trans_presets.java:1251
 msgid "Max. speed (km/h)"
 msgstr "最高限速 (km/h)"
@@ -17520,14 +17727,14 @@
 #: build/trans_presets.java:158 build/trans_presets.java:174
 #: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:248
-#: build/trans_presets.java:266 build/trans_presets.java:284
-#: build/trans_presets.java:303 build/trans_presets.java:323
-#: build/trans_presets.java:336 build/trans_presets.java:350
-#: build/trans_presets.java:382 build/trans_presets.java:434
-#: build/trans_presets.java:458 build/trans_presets.java:482
+#: build/trans_presets.java:230 build/trans_presets.java:249
+#: build/trans_presets.java:267 build/trans_presets.java:285
+#: build/trans_presets.java:304 build/trans_presets.java:325
+#: build/trans_presets.java:338 build/trans_presets.java:352
+#: build/trans_presets.java:383 build/trans_presets.java:433
+#: build/trans_presets.java:457 build/trans_presets.java:481
 #: build/trans_presets.java:506 build/trans_presets.java:526
 #: build/trans_presets.java:549 build/trans_presets.java:571
-#: build/trans_presets.java:589 build/trans_presets.java:610
-#: build/trans_presets.java:1175
+#: build/trans_presets.java:591 build/trans_presets.java:614
+#: build/trans_presets.java:1244
 msgid "Oneway"
 msgstr "單行道"
@@ -17570,13 +17777,13 @@
 #: build/trans_presets.java:160 build/trans_presets.java:176
 #: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:337
-#: build/trans_presets.java:383 build/trans_presets.java:392
-#: build/trans_presets.java:435 build/trans_presets.java:454
-#: build/trans_presets.java:478 build/trans_presets.java:507
+#: build/trans_presets.java:231 build/trans_presets.java:250
+#: build/trans_presets.java:268 build/trans_presets.java:286
+#: build/trans_presets.java:305 build/trans_presets.java:339
+#: build/trans_presets.java:384 build/trans_presets.java:393
+#: build/trans_presets.java:434 build/trans_presets.java:453
+#: build/trans_presets.java:477 build/trans_presets.java:507
 #: build/trans_presets.java:527 build/trans_presets.java:550
-#: build/trans_presets.java:572 build/trans_presets.java:590
-#: build/trans_presets.java:611 build/trans_presets.java:1176
+#: build/trans_presets.java:572 build/trans_presets.java:592
+#: build/trans_presets.java:615 build/trans_presets.java:1245
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -17614,13 +17821,13 @@
 #: build/trans_presets.java:161 build/trans_presets.java:177
 #: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:338
-#: build/trans_presets.java:384 build/trans_presets.java:408
-#: build/trans_presets.java:436 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
+#: build/trans_presets.java:232 build/trans_presets.java:251
+#: build/trans_presets.java:269 build/trans_presets.java:287
+#: build/trans_presets.java:306 build/trans_presets.java:340
+#: build/trans_presets.java:385 build/trans_presets.java:409
+#: build/trans_presets.java:435 build/trans_presets.java:454
+#: build/trans_presets.java:478 build/trans_presets.java:508
 #: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:591
-#: build/trans_presets.java:612 build/trans_presets.java:1177
+#: build/trans_presets.java:573 build/trans_presets.java:593
+#: build/trans_presets.java:616 build/trans_presets.java:1246
 msgid "Tunnel"
 msgstr "隧道"
@@ -17655,13 +17862,13 @@
 #: build/trans_presets.java:162 build/trans_presets.java:178
 #: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:339
-#: build/trans_presets.java:385 build/trans_presets.java:437
-#: build/trans_presets.java:456 build/trans_presets.java:480
+#: build/trans_presets.java:233 build/trans_presets.java:252
+#: build/trans_presets.java:270 build/trans_presets.java:288
+#: build/trans_presets.java:307 build/trans_presets.java:341
+#: build/trans_presets.java:386 build/trans_presets.java:436
+#: build/trans_presets.java:455 build/trans_presets.java:479
 #: build/trans_presets.java:509 build/trans_presets.java:529
 #: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:592 build/trans_presets.java:613
-#: build/trans_presets.java:1178
+#: build/trans_presets.java:594 build/trans_presets.java:617
+#: build/trans_presets.java:1247
 msgid "Cutting"
 msgstr "斷開"
@@ -17696,13 +17903,13 @@
 #: build/trans_presets.java:163 build/trans_presets.java:179
 #: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:340
-#: build/trans_presets.java:386 build/trans_presets.java:438
-#: build/trans_presets.java:457 build/trans_presets.java:481
+#: build/trans_presets.java:234 build/trans_presets.java:253
+#: build/trans_presets.java:271 build/trans_presets.java:289
+#: build/trans_presets.java:308 build/trans_presets.java:342
+#: build/trans_presets.java:387 build/trans_presets.java:437
+#: build/trans_presets.java:456 build/trans_presets.java:480
 #: build/trans_presets.java:510 build/trans_presets.java:530
 #: build/trans_presets.java:553 build/trans_presets.java:575
-#: build/trans_presets.java:593 build/trans_presets.java:614
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:595 build/trans_presets.java:618
+#: build/trans_presets.java:1248
 msgid "Embankment"
 msgstr "堤防"
@@ -17834,4 +18041,13 @@
 msgid "Edit Unclassified Road"
 msgstr "編輯未分類的道路"
+
+#. item "Highways/Streets/Unclassified" check "Embankment"
+#. item "Highways/Streets/Service" check "Embankment"
+#. item "Ways/Combined Foot- and Cycleway" check "Embankment"
+#. item "Ways/Dedicated Footway" check "Embankment"
+#: build/trans_presets.java:235 build/trans_presets.java:309
+#: build/trans_presets.java:576 build/trans_presets.java:596
+msgid "Passing Places"
+msgstr ""
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
@@ -17849,15 +18065,15 @@
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:237 build/trans_presets.java:255
-#: build/trans_presets.java:273 build/trans_presets.java:291
-#: build/trans_presets.java:311 build/trans_presets.java:344
-#: build/trans_presets.java:389 build/trans_presets.java:405
-#: build/trans_presets.java:419 build/trans_presets.java:443
-#: build/trans_presets.java:467 build/trans_presets.java:495
+#: build/trans_presets.java:238 build/trans_presets.java:256
+#: build/trans_presets.java:274 build/trans_presets.java:292
+#: build/trans_presets.java:313 build/trans_presets.java:346
+#: build/trans_presets.java:390 build/trans_presets.java:406
+#: build/trans_presets.java:420 build/trans_presets.java:442
+#: build/trans_presets.java:466 build/trans_presets.java:495
 #: build/trans_presets.java:514 build/trans_presets.java:534
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:598 build/trans_presets.java:618
-#: build/trans_presets.java:1183 build/trans_presets.java:1359
-#: build/trans_presets.java:1404
+#: build/trans_presets.java:556 build/trans_presets.java:580
+#: build/trans_presets.java:602 build/trans_presets.java:622
+#: build/trans_presets.java:1252 build/trans_presets.java:1455
+#: build/trans_presets.java:1500
 msgid "Width (meters)"
 msgstr "寬度 (米)"
@@ -17869,5 +18085,5 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:240 build/trans_surveyor.java:88
+#: build/trans_presets.java:241 build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "居住的(Residential)"
@@ -17876,5 +18092,5 @@
 #. <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:243
+#: build/trans_presets.java:244
 msgid "Edit Residential Street"
 msgstr "編輯居住的街道"
@@ -17892,16 +18108,19 @@
 #. item "Ways/Dedicated Cycleway" combo "Layer"
 #. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
 #. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Dedicated Footway" combo "Layer"
 #. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "Surface"
 msgstr "路面"
@@ -17923,166 +18142,173 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "paved"
 msgstr "有鋪面的"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "unpaved"
 msgstr "沒鋪面的"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "concrete"
 msgstr "水泥地"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "metal"
 msgstr "金屬"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181 build/trans_presets.java:2326
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250 build/trans_presets.java:2488
 msgid "wood"
 msgstr "木頭"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:600
+#: build/trans_presets.java:620 build/trans_presets.java:1250
 msgid "cobblestone"
 msgstr "石子路"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "gravel"
 msgstr "碎石路"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:483
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:482
 #: build/trans_presets.java:512 build/trans_presets.java:533
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:616
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:555 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "grass"
 msgstr "草地"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "sand"
 msgstr "沙地"
 
-#: build/trans_presets.java:254 build/trans_presets.java:272
-#: build/trans_presets.java:290 build/trans_presets.java:309
-#: build/trans_presets.java:324 build/trans_presets.java:342
-#: build/trans_presets.java:440 build/trans_presets.java:459
-#: build/trans_presets.java:483 build/trans_presets.java:512
+#: build/trans_presets.java:255 build/trans_presets.java:273
+#: build/trans_presets.java:291 build/trans_presets.java:311
+#: build/trans_presets.java:326 build/trans_presets.java:344
+#: build/trans_presets.java:439 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:512
 #: build/trans_presets.java:533 build/trans_presets.java:555
-#: build/trans_presets.java:577 build/trans_presets.java:596
-#: build/trans_presets.java:616 build/trans_presets.java:1181
+#: build/trans_presets.java:577 build/trans_presets.java:579
+#: build/trans_presets.java:600 build/trans_presets.java:620
+#: build/trans_presets.java:1250
 msgid "ground"
 msgstr "地面"
@@ -18090,5 +18316,5 @@
 #. item "Highways/Streets/Residential" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:258
+#: build/trans_presets.java:259
 msgid "Living Street"
 msgstr "生活街道"
@@ -18097,5 +18323,5 @@
 #. <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:261
+#: build/trans_presets.java:262
 msgid "Edit Living Street"
 msgstr "編輯生活街道"
@@ -18103,5 +18329,5 @@
 #. item "Highways/Streets/Living Street" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:276
+#: build/trans_presets.java:277
 msgid "Pedestrian"
 msgstr "徒步區"
@@ -18110,5 +18336,5 @@
 #. <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:279
+#: build/trans_presets.java:280
 msgid "Edit Pedestrian Street"
 msgstr "編輯徒步區街道"
@@ -18116,5 +18342,5 @@
 #. item "Highways/Streets/Pedestrian" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:294
+#: build/trans_presets.java:295
 msgid "Service"
 msgstr "巷/弄(Service)"
@@ -18123,5 +18349,5 @@
 #. <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:297
+#: build/trans_presets.java:298
 msgid "Edit Serviceway"
 msgstr "編輯巷/弄"
@@ -18131,18 +18357,18 @@
 #. <key key="highway" value="service" />
 #. <optional>
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "Serviceway type"
 msgstr "巷/弄道路類型"
 
 #. item "Highways/Streets/Service" combo "Serviceway type"
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "alley"
 msgstr "巷/弄"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "driveway"
 msgstr "車道"
 
-#: build/trans_presets.java:301
+#: build/trans_presets.java:302
 msgid "parking_aisle"
 msgstr "停車場通道"
@@ -18150,5 +18376,5 @@
 #. item "Highways/Streets/Service" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:314
+#: build/trans_presets.java:316
 msgid "Parking Aisle"
 msgstr "停車場通道"
@@ -18158,5 +18384,5 @@
 #. 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:318
+#: build/trans_presets.java:320
 msgid "Edit Parking Aisle"
 msgstr "編輯停車場通道"
@@ -18164,5 +18390,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:328
+#: build/trans_presets.java:330
 msgid "Road (Unknown Type)"
 msgstr "道路（不明的類型）"
@@ -18171,5 +18397,5 @@
 #. <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:331
+#: build/trans_presets.java:333
 msgid "Edit Road of unknown type"
 msgstr "編輯不明類型的道路"
@@ -18178,20 +18404,20 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:348
+#: build/trans_presets.java:350
 msgid "Road Restrictions"
 msgstr "道路限制"
 
 #. item "Highways/Streets/Road Restrictions"
-#: build/trans_presets.java:349
+#: build/trans_presets.java:351
 msgid "Edit Road Restrictions"
 msgstr "編輯道路限制"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:351
+#: build/trans_presets.java:353
 msgid "Toll"
 msgstr "通行費"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:352
+#: build/trans_presets.java:354
 msgid "No exit (cul-de-sac)"
 msgstr "沒有出口（死路）"
@@ -18199,9 +18425,10 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:353 build/trans_presets.java:464
+#: build/trans_presets.java:355 build/trans_presets.java:463
 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"
@@ -18212,6 +18439,4 @@
 #. item "Highways/Streets/Road Restrictions" combo "Motorcar"
 #. item "Highways/Streets/Road Restrictions" combo "Public Service Vehicles (psv)"
-#. item "Highways/Streets/Road Restrictions" combo "Motorboat"
-#. item "Highways/Streets/Road Restrictions" combo "Boat"
 #. item "Ways/Track" combo "Access"
 #. item "Ways/Track" combo "Motorcycle"
@@ -18223,4 +18448,5 @@
 #. 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"
@@ -18239,141 +18465,149 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:353 build/trans_presets.java:354
 #: build/trans_presets.java:355 build/trans_presets.java:356
 #: build/trans_presets.java:357 build/trans_presets.java:358
 #: build/trans_presets.java:359 build/trans_presets.java:360
 #: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:490
+#: build/trans_presets.java:491 build/trans_presets.java:492
+#: build/trans_presets.java:531 build/trans_presets.java:598
+#: build/trans_presets.java:674 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1368 build/trans_presets.java:1369
+#: build/trans_presets.java:1370 build/trans_presets.java:1489
+#: build/trans_presets.java:1490 build/trans_presets.java:1491
+#: build/trans_presets.java:1783 build/trans_presets.java:1793
+#: build/trans_presets.java:2445 build/trans_presets.java:2446
+#: build/trans_presets.java:2487 build/trans_presets.java:2496
+#: build/trans_presets.java:2497 build/trans_presets.java:2498
+#: build/trans_presets.java:2788
+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:355 build/trans_presets.java:357
+#: build/trans_presets.java:358 build/trans_presets.java:359
+#: build/trans_presets.java:360 build/trans_presets.java:361
+#: build/trans_presets.java:362 build/trans_presets.java:363
+#: build/trans_presets.java:364 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_style.java:212
+msgid "private"
+msgstr "私人的"
+
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:486
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:490 build/trans_presets.java:491
+#: build/trans_presets.java:492
+msgid "designated"
+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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 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:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_style.java:205
+msgid "permissive"
+msgstr ""
+
+#: build/trans_presets.java:355 build/trans_presets.java:360
+#: build/trans_presets.java:363 build/trans_presets.java:463
+#: build/trans_presets.java:464 build/trans_presets.java:465
+msgid "agricultural"
+msgstr "農業的"
+
+#. item "Amenities/Toilets" combo "Wheelchair"
+#: build/trans_presets.java:355 build/trans_presets.java:356
+#: build/trans_presets.java:357 build/trans_presets.java:358
+#: build/trans_presets.java:359 build/trans_presets.java:360
+#: build/trans_presets.java:361 build/trans_presets.java:362
+#: build/trans_presets.java:363 build/trans_presets.java:364
+#: build/trans_presets.java:463 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:485
 #: build/trans_presets.java:486 build/trans_presets.java:487
 #: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:1268
-#: build/trans_presets.java:1269 build/trans_presets.java:1272
-#: build/trans_presets.java:1273 build/trans_presets.java:1274
-#: build/trans_presets.java:1393 build/trans_presets.java:1394
-#: build/trans_presets.java:1395 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
-#: build/trans_presets.java:2289 build/trans_presets.java:2325
-#: build/trans_presets.java:2334 build/trans_presets.java:2335
-#: build/trans_presets.java:2336 build/trans_presets.java:2620
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:212
-msgid "private"
-msgstr "私人的"
-
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-msgid "designated"
-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:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:219
-msgid "destination"
-msgstr "目的地"
-
-#. color deprecated
-#. <icon annotate="true" src="misc/deprecated.png"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>40000</scale_max>
-#. </rule>
-#.
-#. <!--restrictions tags -->
-#. <!--the restrictions rules should be placed before the path rule! -->
-#.
-#. <rule>
-#. <condition k="access" b="no"/>
-#. <icon src="vehicle/restriction/access.png" priority="-100"/>
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#. <rule>
-#. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_style.java:205
-msgid "permissive"
-msgstr ""
-
-#: build/trans_presets.java:353 build/trans_presets.java:357
-#: build/trans_presets.java:360 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-msgid "agricultural"
-msgstr "農業的"
-
-#. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:353 build/trans_presets.java:354
-#: build/trans_presets.java:355 build/trans_presets.java:356
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:464
-#: build/trans_presets.java:465 build/trans_presets.java:466
-#: build/trans_presets.java:486 build/trans_presets.java:487
-#: build/trans_presets.java:488 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:531
-#: build/trans_presets.java:594 build/trans_presets.java:646
-#: build/trans_presets.java:661 build/trans_presets.java:1205
-#: build/trans_presets.java:1268 build/trans_presets.java:1269
-#: build/trans_presets.java:1272 build/trans_presets.java:1273
-#: build/trans_presets.java:1274 build/trans_presets.java:1393
-#: build/trans_presets.java:1394 build/trans_presets.java:1395
-#: build/trans_presets.java:1628 build/trans_presets.java:1638
-#: build/trans_presets.java:2288 build/trans_presets.java:2289
-#: build/trans_presets.java:2325 build/trans_presets.java:2334
-#: build/trans_presets.java:2335 build/trans_presets.java:2336
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:598 build/trans_presets.java:650
+#: build/trans_presets.java:665 build/trans_presets.java:1160
+#: build/trans_presets.java:1172 build/trans_presets.java:1184
+#: build/trans_presets.java:1196 build/trans_presets.java:1208
+#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1274 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1368
+#: build/trans_presets.java:1369 build/trans_presets.java:1370
+#: build/trans_presets.java:1489 build/trans_presets.java:1490
+#: build/trans_presets.java:1491 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
+#: build/trans_presets.java:2446 build/trans_presets.java:2487
+#: build/trans_presets.java:2496 build/trans_presets.java:2497
+#: build/trans_presets.java:2498 build/trans_presets.java:2788
 msgid "no"
 msgstr "否"
 
 #: build/trans_presets.java:356
+msgid "Agricultural"
+msgstr ""
+
+#: build/trans_presets.java:359
 msgid "Goods"
 msgstr "貨物"
 
-#: build/trans_presets.java:357
+#: build/trans_presets.java:360
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "大型車 (hgv)"
@@ -18388,10 +18622,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:358 build/trans_presets.java:488
-#: build/trans_presets.java:731 build/trans_presets.java:764
-#: build/trans_presets.java:786 build/trans_presets.java:823
-#: build/trans_presets.java:836 build/trans_presets.java:848
-#: build/trans_presets.java:860 build/trans_presets.java:872
-#: build/trans_presets.java:912
+#: build/trans_presets.java:361 build/trans_presets.java:488
+#: build/trans_presets.java:751 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:932
 msgid "Horse"
 msgstr "馬"
@@ -18407,10 +18641,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:359 build/trans_presets.java:465
-#: build/trans_presets.java:732 build/trans_presets.java:750
-#: build/trans_presets.java:765 build/trans_presets.java:787
-#: build/trans_presets.java:824 build/trans_presets.java:837
-#: build/trans_presets.java:849 build/trans_presets.java:861
-#: build/trans_presets.java:873 build/trans_presets.java:913
+#: build/trans_presets.java:362 build/trans_presets.java:464
+#: build/trans_presets.java:752 build/trans_presets.java:770
+#: build/trans_presets.java:785 build/trans_presets.java:807
+#: build/trans_presets.java:844 build/trans_presets.java:857
+#: build/trans_presets.java:869 build/trans_presets.java:881
+#: build/trans_presets.java:893 build/trans_presets.java:933
 msgid "Motorcycle"
 msgstr "機車"
@@ -18425,27 +18659,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:360 build/trans_presets.java:466
-#: build/trans_presets.java:492 build/trans_presets.java:751
-#: build/trans_presets.java:766 build/trans_presets.java:788
-#: build/trans_presets.java:825 build/trans_presets.java:838
-#: build/trans_presets.java:850 build/trans_presets.java:862
-#: build/trans_presets.java:874 build/trans_presets.java:914
+#: build/trans_presets.java:363 build/trans_presets.java:465
+#: build/trans_presets.java:492 build/trans_presets.java:771
+#: 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:934
 msgid "Motorcar"
 msgstr "汽車"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:364
 msgid "Public Service Vehicles (psv)"
 msgstr "公共汽車 (psv)"
 
-#: build/trans_presets.java:362
-msgid "Motorboat"
-msgstr "動力小船"
-
-#: build/trans_presets.java:363
-msgid "Boat"
-msgstr "小船"
-
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:365
+#: build/trans_presets.java:366
 msgid "Min. speed (km/h)"
 msgstr "最低限速 (km/h)"
@@ -18453,25 +18679,25 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:366 build/trans_presets.java:404
+#: build/trans_presets.java:367 build/trans_presets.java:405
 msgid "Max. weight (tonnes)"
 msgstr "總重限制（噸）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:367
+#: build/trans_presets.java:368
 msgid "Max. Height (meters)"
 msgstr "高度限制（米）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:369
 msgid "Max. Width (meters)"
 msgstr "寬度限制（米）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:369
+#: build/trans_presets.java:370
 msgid "Max. Length (meters)"
 msgstr "長度限制（米）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:372
 msgid "Roundabout"
 msgstr "圓環"
@@ -18482,5 +18708,5 @@
 #. 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:376
+#: build/trans_presets.java:377
 msgid "Edit Junction"
 msgstr "編輯交叉點"
@@ -18500,10 +18726,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:553
+#: build/trans_presets.java:380 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "高速公路"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "motorway_link"
 msgstr "高速公路連絡道路"
@@ -18525,10 +18751,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:569
+#: build/trans_presets.java:380 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "快速道路"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "trunk_link"
 msgstr "快速道路連絡道路"
@@ -18550,10 +18776,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:585
+#: build/trans_presets.java:380 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "省道"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "primary_link"
 msgstr "省道連絡道路"
@@ -18575,5 +18801,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:379 build/trans_style.java:601
+#: build/trans_presets.java:380 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -18588,9 +18814,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:379 build/trans_style.java:617
+#: build/trans_presets.java:380 build/trans_style.java:617
 msgid "tertiary"
 msgstr "鄉道"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "unclassified"
 msgstr "未分類的"
@@ -18604,9 +18830,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:379 build/trans_style.java:3252
+#: build/trans_presets.java:380 build/trans_style.java:3252
 msgid "residential"
 msgstr "居住的"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "living_street"
 msgstr "生活街道"
@@ -18636,10 +18862,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:379 build/trans_style.java:673
+#: build/trans_presets.java:380 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "巷/弄"
 
-#: build/trans_presets.java:379
+#: build/trans_presets.java:380
 msgid "bus_guideway"
 msgstr "公車專用道"
@@ -18669,5 +18895,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:379 build/trans_style.java:880
+#: build/trans_presets.java:380 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -18679,10 +18905,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:397
+#: build/trans_presets.java:398
 msgid "Edit Bridge"
 msgstr "編輯橋樑"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:409
+#: build/trans_presets.java:410
 msgid "Edit Tunnel"
 msgstr "編輯隧道"
@@ -18690,19 +18916,19 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:423
+#: build/trans_presets.java:424
 msgid "Ways"
 msgstr "路徑"
 
 #. group "Ways"
-#: build/trans_presets.java:424
+#: build/trans_presets.java:425
 msgid "Construction"
 msgstr "施工"
 
 #. item "Ways/Construction"
-#: build/trans_presets.java:425
+#: build/trans_presets.java:426
 msgid "Edit Highway Under Construction"
 msgstr "編輯施工中的公路"
 
-#: build/trans_presets.java:441
+#: build/trans_presets.java:440
 msgid "Junction"
 msgstr "交叉點"
@@ -18718,5 +18944,5 @@
 #. <rule>
 #. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:441 build/trans_style.java:898
+#: build/trans_presets.java:440 build/trans_style.java:898
 msgid "roundabout"
 msgstr "圓環"
@@ -18724,5 +18950,5 @@
 #. item "Ways/Construction" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:446
+#: build/trans_presets.java:445
 msgid "Track"
 msgstr "產業道路"
@@ -18731,40 +18957,34 @@
 #. <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:449
+#: build/trans_presets.java:448
 msgid "Edit Track"
 msgstr "編輯產業道路"
 
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "Tracktype"
-msgstr "產業道路"
+msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:460
-#, fuzzy
+#: build/trans_presets.java:459
 msgid "grade1"
-msgstr "碎石路"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade2"
-msgstr "碎石路"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade3"
-msgstr "碎石路"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade4"
-msgstr "碎石路"
-
-#: build/trans_presets.java:460
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:459
 msgid "grade5"
-msgstr "碎石路"
-
-#: build/trans_presets.java:461 build/trans_presets.java:484
+msgstr ""
+
+#: build/trans_presets.java:460 build/trans_presets.java:483
 msgid "MTB Scale"
 msgstr ""
@@ -18772,5 +18992,5 @@
 #. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "SAC Scale"
 msgstr ""
@@ -18778,37 +18998,32 @@
 #. item "Ways/Track" combo "SAC Scale"
 #. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:461 build/trans_presets.java:484
+#: build/trans_presets.java:3219
 msgid "hiking"
 msgstr "健行"
 
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "mountain_hiking"
-msgstr "登山"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_mountain_hiking"
-msgstr "較難的登山健行"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "alpine_hiking"
-msgstr "高山健行"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "demanding_alpine_hiking"
-msgstr "較難的高山健行"
-
-#: build/trans_presets.java:462 build/trans_presets.java:485
-#, fuzzy
+msgstr ""
+
+#: build/trans_presets.java:461 build/trans_presets.java:484
 msgid "difficult_alpine_hiking"
-msgstr "艱難的高山健行"
+msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:470
+#: build/trans_presets.java:469
 msgid "Path"
 msgstr "路徑"
@@ -18817,7 +19032,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:473
+#: build/trans_presets.java:472
 msgid "Edit Path"
 msgstr "編輯小徑"
+
+#. item "Ways/Path" combo "Visibility"
+#: build/trans_presets.java:485
+msgid "excellent"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "good"
+msgstr ""
+
+#: build/trans_presets.java:485 build/trans_presets.java:2047
+msgid "intermediate"
+msgstr "中級"
+
+#: build/trans_presets.java:485
+msgid "bad"
+msgstr ""
+
+#: build/trans_presets.java:485
+msgid "horrible"
+msgstr ""
 
 #: build/trans_presets.java:489
@@ -18837,7 +19073,6 @@
 #. <separator/>
 #: build/trans_presets.java:499
-#, fuzzy
 msgid "Dedicated Bridleway"
-msgstr "編輯馬道"
+msgstr ""
 
 #. item "Ways/Dedicated Bridleway"
@@ -18850,7 +19085,6 @@
 #. </optional>
 #: build/trans_presets.java:517
-#, fuzzy
 msgid "Dedicated Cycleway"
-msgstr "編輯自行車道"
+msgstr ""
 
 #. item "Ways/Dedicated Cycleway"
@@ -18885,24 +19119,21 @@
 #. </optional>
 #: build/trans_presets.java:559
-#, fuzzy
 msgid "Combined Foot- and Cycleway"
-msgstr "合併，不管怎樣"
+msgstr ""
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:581
-#, fuzzy
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr "編輯人行步道"
+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:584
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "編輯人行步道"
 
-#. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:594
+#: build/trans_presets.java:598
 msgid "Bikes"
 msgstr ""
@@ -18910,5 +19141,5 @@
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:601
+#: build/trans_presets.java:605
 msgid "Steps"
 msgstr "階梯"
@@ -18918,5 +19149,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:605
+#: build/trans_presets.java:609
 msgid "Edit Flight of Steps"
 msgstr "編輯階梯"
@@ -18924,10 +19155,10 @@
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:622
+#: build/trans_presets.java:626
 msgid "Waypoints"
 msgstr "路標"
 
 #. group "Waypoints"
-#: build/trans_presets.java:623
+#: build/trans_presets.java:627
 msgid "Motorway Junction"
 msgstr "高速公路交流道"
@@ -18935,15 +19166,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:625
+#: build/trans_presets.java:629
 msgid "Edit Motorway Junction"
 msgstr "編輯高速公路交流道"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:633
 msgid "Number"
 msgstr "編號"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:631
+#: build/trans_presets.java:635
 msgid "Services"
 msgstr "休息站"
@@ -18951,5 +19182,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:633
+#: build/trans_presets.java:637
 msgid "Edit Service Station"
 msgstr "編輯休息站"
@@ -18957,5 +19188,6 @@
 #. item "Waypoints/Services" text "Name"
 #. item "Barriers/Toll Booth" text "Name"
-#. item "Car/Fuel" text "Name"
+#. item "Car/Fuel" label "Edit Fuel"
+#. <key key="amenity" value="fuel" />
 #. item "Car/Wash" text "Name"
 #. item "Car/Repair" text "Name"
@@ -18988,17 +19220,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:638 build/trans_presets.java:775
-#: build/trans_presets.java:1257 build/trans_presets.java:1281
-#: build/trans_presets.java:1287 build/trans_presets.java:1295
-#: build/trans_presets.java:1302 build/trans_presets.java:1626
-#: build/trans_presets.java:1636 build/trans_presets.java:2065
-#: build/trans_presets.java:2167 build/trans_presets.java:2197
-#: build/trans_presets.java:2249 build/trans_presets.java:2257
-#: build/trans_presets.java:2274 build/trans_presets.java:2286
-#: build/trans_presets.java:2295 build/trans_presets.java:2302
-#: build/trans_presets.java:2356 build/trans_presets.java:2366
-#: build/trans_presets.java:2418 build/trans_presets.java:2584
-#: build/trans_presets.java:2599 build/trans_presets.java:2638
-#: build/trans_presets.java:3058
+#: build/trans_presets.java:642 build/trans_presets.java:795
+#: build/trans_presets.java:1335 build/trans_presets.java:1377
+#: build/trans_presets.java:1383 build/trans_presets.java:1391
+#: build/trans_presets.java:1398 build/trans_presets.java:1781
+#: build/trans_presets.java:1791 build/trans_presets.java:2220
+#: build/trans_presets.java:2322 build/trans_presets.java:2352
+#: build/trans_presets.java:2405 build/trans_presets.java:2413
+#: build/trans_presets.java:2430 build/trans_presets.java:2443
+#: build/trans_presets.java:2452 build/trans_presets.java:2459
+#: build/trans_presets.java:2524 build/trans_presets.java:2534
+#: build/trans_presets.java:2586 build/trans_presets.java:2752
+#: build/trans_presets.java:2767 build/trans_presets.java:2806
+#: build/trans_presets.java:3226
 msgid "Operator"
 msgstr "經營者"
@@ -19007,5 +19239,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:642
+#: build/trans_presets.java:646
 msgid "Traffic Signal"
 msgstr "交通號誌"
@@ -19015,5 +19247,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:646
+#: build/trans_presets.java:650
 msgid "Pedestrian crossing type"
 msgstr "行人穿越道類型"
@@ -19022,27 +19254,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "uncontrolled"
 msgstr "沒有號誌"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "traffic_signals"
 msgstr "交通號誌"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "island"
 msgstr "安全島"
 
-#: build/trans_presets.java:646 build/trans_presets.java:661
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:1274
 msgid "unmarked"
 msgstr "未畫標記"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:647 build/trans_presets.java:663
-#: build/trans_presets.java:1206
+#: build/trans_presets.java:651 build/trans_presets.java:667
+#: build/trans_presets.java:1275
 msgid "Cross on horseback"
 msgstr ""
@@ -19050,6 +19282,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:648 build/trans_presets.java:662
-#: build/trans_presets.java:1207
+#: build/trans_presets.java:652 build/trans_presets.java:666
+#: build/trans_presets.java:1276
 msgid "Cross by bicycle"
 msgstr "以自行車穿越"
@@ -19058,11 +19290,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:649 build/trans_presets.java:664
-#: build/trans_presets.java:1208
+#: build/trans_presets.java:653 build/trans_presets.java:668
+#: build/trans_presets.java:1277
 msgid "Crossing attendant"
 msgstr "有人陪同穿越"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:650
+#: build/trans_presets.java:654
 msgid "Crossing type name (UK)"
 msgstr "行人穿越道類型名稱 (英國)"
@@ -19070,30 +19302,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "zebra"
 msgstr "斑馬線"
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:650 build/trans_presets.java:665
+#: build/trans_presets.java:654 build/trans_presets.java:669
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:653
+#: build/trans_presets.java:657
 msgid "Stop"
 msgstr "禁止通行"
@@ -19101,5 +19333,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:656
+#: build/trans_presets.java:660
 msgid "Pedestrian Crossing"
 msgstr "行人穿越道"
@@ -19108,14 +19340,60 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:659
+#: build/trans_presets.java:663
 msgid "Edit Crossing"
 msgstr "編輯行人穿越道"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:665
+#: build/trans_presets.java:669
 msgid "Type name (UK)"
 msgstr "類型名稱 (英國)"
 
-#: build/trans_presets.java:667
+#: build/trans_presets.java:671
+msgid "Traffic Calming"
+msgstr ""
+
+#. item "Waypoints/Traffic Calming"
+#. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
+#: build/trans_presets.java:673
+msgid "Edit Traffic Calming"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "bump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "chicane"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "choker"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "cushion"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "hump"
+msgstr ""
+
+#: build/trans_presets.java:674
+msgid "table"
+msgstr ""
+
+#: build/trans_presets.java:676
+msgid "Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
+#: build/trans_presets.java:678
+msgid "Edit Passing Place"
+msgstr ""
+
+#. item "Waypoints/Passing Place" label "Edit Passing Place"
+#. <key key="highway" value="passing_place" />
+#: build/trans_presets.java:681
 msgid "Mini-roundabout"
 msgstr "小型圓環"
@@ -19126,14 +19404,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "Direction"
 msgstr "方向"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:672
+#: build/trans_presets.java:686
 msgid "clockwise"
 msgstr "順時針"
 
-#: build/trans_presets.java:674
+#: build/trans_presets.java:688
 msgid "Turning Circle"
 msgstr ""
@@ -19143,26 +19421,28 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:679
+#: build/trans_presets.java:693
 msgid "City Limit"
 msgstr "城市邊界"
 
 #. item "Waypoints/City Limit"
-#: build/trans_presets.java:680
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:695
 msgid "Edit City Limit Sign"
 msgstr "編輯城市邊界標誌"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:685
+#: build/trans_presets.java:700
 msgid "Second Name"
 msgstr "第二名稱"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:687
+#: build/trans_presets.java:702
 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:690
+#: build/trans_presets.java:706
 msgid "Emergency Phone"
 msgstr "緊急電話"
@@ -19170,5 +19450,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:693
+#: build/trans_presets.java:709
 msgid "Incline"
 msgstr "坡"
@@ -19176,5 +19456,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:696
+#: build/trans_presets.java:712
 msgid "Incline Steep"
 msgstr "險升/降坡"
@@ -19182,11 +19462,18 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
+#: build/trans_presets.java:715
+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:700
+#: build/trans_presets.java:720
 msgid "Ford"
 msgstr "淺灘"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:701
+#: build/trans_presets.java:721
 msgid "Edit Ford"
 msgstr "編輯淺灘"
@@ -19194,5 +19481,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:708
+#: build/trans_presets.java:728
 msgid "Mountain Pass"
 msgstr "鞍部"
@@ -19200,5 +19487,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:710
+#: build/trans_presets.java:730
 msgid "Edit Mountain Pass"
 msgstr "編輯鞍部"
@@ -19210,7 +19497,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:715 build/trans_presets.java:1465
-#: build/trans_presets.java:1610 build/trans_presets.java:2752
-#: build/trans_presets.java:2759 build/trans_presets.java:2766
+#: build/trans_presets.java:735 build/trans_presets.java:1620
+#: build/trans_presets.java:1765 build/trans_presets.java:2920
+#: build/trans_presets.java:2927 build/trans_presets.java:2934
 msgid "Elevation"
 msgstr "海拔"
@@ -19218,5 +19505,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:719
+#: build/trans_presets.java:739
 msgid "Barriers"
 msgstr "障礙物"
@@ -19224,5 +19511,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:722
+#: build/trans_presets.java:742
 msgid "Bollard"
 msgstr "車阻柱"
@@ -19230,5 +19517,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:724
+#: build/trans_presets.java:744
 msgid "Edit Bollard"
 msgstr "編輯車阻柱"
@@ -19273,16 +19560,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:727 build/trans_presets.java:746
-#: build/trans_presets.java:760 build/trans_presets.java:782
-#: build/trans_presets.java:819 build/trans_presets.java:832
-#: build/trans_presets.java:844 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:890 build/trans_presets.java:899
-#: build/trans_presets.java:908
+#: build/trans_presets.java:747 build/trans_presets.java:766
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:900
+#: build/trans_presets.java:910 build/trans_presets.java:919
+#: build/trans_presets.java:928
 msgid "Allowed traffic:"
 msgstr "允許通行方向："
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:734
+#: build/trans_presets.java:754
 msgid "Cycle Barrier"
 msgstr "自行車護欄"
@@ -19291,5 +19578,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:738
+#: build/trans_presets.java:758
 msgid "Block"
 msgstr "水泥護欄"
@@ -19297,5 +19584,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:741
+#: build/trans_presets.java:761
 msgid "Cattle Grid"
 msgstr "家畜柵欄"
@@ -19303,10 +19590,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:743
+#: build/trans_presets.java:763
 msgid "Edit Cattle Grid"
 msgstr "編輯家畜柵欄"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:753
+#: build/trans_presets.java:773
 msgid "Bus Trap"
 msgstr "公車專用道障礙"
@@ -19314,15 +19601,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:756
+#: build/trans_presets.java:776
 msgid "Spikes"
 msgstr "長釘"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:757
+#: build/trans_presets.java:777
 msgid "Edit Spikes"
 msgstr "編輯長釘"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:768
+#: build/trans_presets.java:788
 msgid "Toll Booth"
 msgstr "收費站"
@@ -19330,5 +19617,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:770
+#: build/trans_presets.java:790
 msgid "Edit Toll Booth"
 msgstr "編輯收費站"
@@ -19336,10 +19623,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:778
+#: build/trans_presets.java:798
 msgid "Border Control"
 msgstr "國境管控站"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:799
 msgid "Edit Border Control"
 msgstr "編輯國境管控站"
@@ -19349,5 +19636,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:793
+#: build/trans_presets.java:813
 msgid "Hedge"
 msgstr "籬笆"
@@ -19356,12 +19643,24 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=hedge" />
 #. <key key="barrier" value="hedge" />
-#: build/trans_presets.java:797
+#. item "Barriers/Fence"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
+#: build/trans_presets.java:817 build/trans_presets.java:819
 msgid "Fence"
 msgstr "欄柵"
 
-#. item "Barriers/Fence"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#. <key key="barrier" value="fence" />
-#: build/trans_presets.java:801
+#. item "Barriers/Fence" combo "Fence"
+#: build/trans_presets.java:819
+msgid "fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wood_fence"
+msgstr ""
+
+#: build/trans_presets.java:819
+msgid "wire_fence"
+msgstr ""
+
+#: build/trans_presets.java:821
 msgid "Wall"
 msgstr "牆"
@@ -19369,5 +19668,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:804
+#: build/trans_presets.java:824
 msgid "City Wall"
 msgstr "城牆"
@@ -19376,5 +19675,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:808
+#: build/trans_presets.java:828
 msgid "Retaining Wall"
 msgstr "擋土牆"
@@ -19386,15 +19685,16 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:835
 msgid "Entrance"
 msgstr "入口"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:816
+#: build/trans_presets.java:836
 msgid "Edit Entrance"
 msgstr "編輯入口"
 
 #. item "Barriers/Entrance" check "Motorcar"
-#: build/trans_presets.java:827
+#. item "Airport/Terminal" text "Name"
+#: build/trans_presets.java:847 build/trans_presets.java:1575
 msgid "Gate"
 msgstr "閘門"
@@ -19402,50 +19702,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:829
+#: build/trans_presets.java:849
 msgid "Edit Gate"
 msgstr "編輯閘門"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:840
+#: build/trans_presets.java:860
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:841
+#: build/trans_presets.java:861
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:852
+#: build/trans_presets.java:872
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:853
+#: build/trans_presets.java:873
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:864
+#: build/trans_presets.java:884
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:865
+#: build/trans_presets.java:885
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:876
+#: build/trans_presets.java:896
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:877
+#: build/trans_presets.java:897
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:885
+#: build/trans_presets.java:905
 msgid "Stile"
 msgstr ""
@@ -19453,25 +19753,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:887
+#: build/trans_presets.java:907
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:895
+#: build/trans_presets.java:915
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:896
+#: build/trans_presets.java:916
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:904
+#: build/trans_presets.java:924
 msgid "Sally Port"
 msgstr "城門"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:905
+#: build/trans_presets.java:925
 msgid "Edit Sally Port"
 msgstr "編輯城門"
@@ -19482,11 +19782,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:919 build/trans_presets.java:920
-#: build/trans_presets.java:963
+#: build/trans_presets.java:939 build/trans_presets.java:940
+#: build/trans_presets.java:991
 msgid "Water"
 msgstr "水域"
 
 #. group "Water/Water"
-#: build/trans_presets.java:921
+#: build/trans_presets.java:941
 msgid "Spring"
 msgstr "泉"
@@ -19494,5 +19794,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:923
+#: build/trans_presets.java:943
 msgid "Edit Spring"
 msgstr "編輯泉"
@@ -19500,5 +19800,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:928
+#: build/trans_presets.java:948
 msgid "Drain"
 msgstr ""
@@ -19506,10 +19806,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:930
+#: build/trans_presets.java:950
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:936
+#: build/trans_presets.java:956
+msgid "Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
+#: build/trans_presets.java:958
+msgid "Edit Ditch"
+msgstr ""
+
+#. item "Water/Water/Ditch" combo "Layer"
+#: build/trans_presets.java:964
 msgid "Stream"
 msgstr "溪流"
@@ -19517,10 +19828,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:938
+#: build/trans_presets.java:966
 msgid "Edit Stream"
 msgstr "編輯溪流"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:944
+#: build/trans_presets.java:972
 msgid "Canal"
 msgstr "運河"
@@ -19528,10 +19839,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:946
+#: build/trans_presets.java:974
 msgid "Edit Canal"
 msgstr "編輯運河"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:952
+#: build/trans_presets.java:980
 msgid "River"
 msgstr "河流"
@@ -19541,5 +19852,5 @@
 #. 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:956
+#: build/trans_presets.java:984
 msgid "Edit River"
 msgstr "編輯河流"
@@ -19547,15 +19858,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:965
+#: build/trans_presets.java:993
 msgid "Edit Water"
 msgstr "編輯水域"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:969
+#: build/trans_presets.java:997
 msgid "Land"
 msgstr "陸地"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:970
+#: build/trans_presets.java:998
 msgid "Edit Land"
 msgstr "編輯陸地"
@@ -19563,15 +19874,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:975
+#: build/trans_presets.java:1003
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:976
+#: build/trans_presets.java:1004
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:981
+#: build/trans_presets.java:1009
 msgid "Reservoir"
 msgstr "貯水處"
@@ -19579,15 +19890,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:983
+#: build/trans_presets.java:1011
 msgid "Edit Reservoir Landuse"
 msgstr "編輯貯水處"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:988
+#: build/trans_presets.java:1016
 msgid "Covered Reservoir"
 msgstr "有覆蓋的貯水處"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:989
+#: build/trans_presets.java:1017
 msgid "Edit Covered Reservoir"
 msgstr "編輯有覆蓋的貯水處"
@@ -19595,5 +19906,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:994
+#: build/trans_presets.java:1022
 msgid "Riverbank"
 msgstr "河岸"
@@ -19602,10 +19913,10 @@
 #. <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:997
+#: build/trans_presets.java:1025
 msgid "Edit Riverbank"
 msgstr "編輯河岸"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1001
+#: build/trans_presets.java:1029
 msgid "Wetland"
 msgstr "溼地"
@@ -19616,14 +19927,14 @@
 #. 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:1006
+#: build/trans_presets.java:1034
 msgid "Edit Wetland"
 msgstr "編輯溼地"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "swamp"
 msgstr "沼澤"
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "bog"
 msgstr "泥沼"
@@ -19637,35 +19948,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1009 build/trans_style.java:3484
+#: build/trans_presets.java:1037 build/trans_style.java:3484
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1009
+#: build/trans_presets.java:1037
 msgid "mangrove"
 msgstr "紅樹林"
 
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1039
 msgid "Mud"
 msgstr ""
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1012
+#: build/trans_presets.java:1040
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1016
+#: build/trans_presets.java:1044
 msgid "Beach"
 msgstr "海灘"
@@ -19673,20 +19984,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1046
 msgid "Edit Beach"
 msgstr "編輯海灘"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1022
+#: build/trans_presets.java:1050
 msgid "Bay"
 msgstr "海灣"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1023
+#: build/trans_presets.java:1051
 msgid "Edit Bay"
 msgstr "編輯海灣"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1055
 msgid "Cliff"
 msgstr "斷崖"
@@ -19694,10 +20005,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1029
+#: build/trans_presets.java:1057
 msgid "Edit Cliff"
 msgstr "編輯斷崖"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1033
+#: build/trans_presets.java:1061
 msgid "Coastline"
 msgstr "海岸線"
@@ -19705,5 +20016,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1035
+#: build/trans_presets.java:1063
 msgid "Edit Coastline"
 msgstr "編輯海岸線"
@@ -19711,5 +20022,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1040
+#: build/trans_presets.java:1068
 msgid "Ferry Route"
 msgstr "渡輪路線"
@@ -19717,5 +20028,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1070
 msgid "Edit Ferry"
 msgstr "編輯渡輪"
@@ -19724,5 +20035,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1050
+#: build/trans_presets.java:1078
 msgid "Boatyard"
 msgstr ""
@@ -19730,10 +20041,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1080
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1085
 msgid "Dock"
 msgstr "船塢"
@@ -19741,5 +20052,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1087
 msgid "Edit Dock"
 msgstr "編輯船塢"
@@ -19747,5 +20058,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1093
 msgid "Dam"
 msgstr "水壩"
@@ -19753,15 +20064,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1067
+#: build/trans_presets.java:1095
 msgid "Edit Dam"
 msgstr "編輯水壩"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1073
+#: build/trans_presets.java:1101
 msgid "Waterway Point"
 msgstr "水路點"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1074
+#: build/trans_presets.java:1102
 msgid "Lock Gate"
 msgstr "調節水門"
@@ -19770,5 +20081,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1078
+#: build/trans_presets.java:1106
 msgid "Weir"
 msgstr "堰"
@@ -19776,20 +20087,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1108
 msgid "Edit Weir"
 msgstr "編輯堰"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1085
+#: build/trans_presets.java:1113
 msgid "Waterfall"
 msgstr "瀑布"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1086
+#: build/trans_presets.java:1114
 msgid "Edit Waterfall"
 msgstr "編輯瀑布"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1091
+#: build/trans_presets.java:1119
 msgid "Turning Point"
 msgstr ""
@@ -19798,15 +20109,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1123
 msgid "Marina"
 msgstr "碼頭"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1096
+#: build/trans_presets.java:1124
 msgid "Edit Marina"
 msgstr "編輯碼頭"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1100
+#: build/trans_presets.java:1128
 msgid "Pier"
 msgstr "渡頭"
@@ -19814,10 +20125,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1102
+#: build/trans_presets.java:1130
 msgid "Edit Pier"
 msgstr "編輯渡頭"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1106
+#: build/trans_presets.java:1134
 msgid "Ferry Terminal"
 msgstr "渡輪端點"
@@ -19825,10 +20136,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1136
 msgid "Edit Ferry Terminal"
 msgstr "編輯渡輪端點"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1112
+#: build/trans_presets.java:1140
 msgid "Slipway"
 msgstr "船臺"
@@ -19838,20 +20149,20 @@
 #. 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:1116
+#: build/trans_presets.java:1144
 msgid "Edit Slipway"
 msgstr "編輯造船臺"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1122
+#: build/trans_presets.java:1150
 msgid "Transport"
 msgstr "運輸"
 
 #. group "Transport"
-#: build/trans_presets.java:1123
+#: build/trans_presets.java:1151
 msgid "Railway"
 msgstr "鐵路"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1124
+#: build/trans_presets.java:1152
 msgid "Rail"
 msgstr "軌"
@@ -19859,5 +20170,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1154
 msgid "Edit Rail"
 msgstr "編輯軌道"
@@ -19866,139 +20177,378 @@
 #. <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:1158 build/trans_presets.java:1170
+#: build/trans_presets.java:1194 build/trans_presets.java:1206
+#: build/trans_presets.java:1218 build/trans_presets.java:1230
+msgid "Gauge (mm)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Gauge (mm)"
+#. <!--
+#. 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_presets.java:1158 build/trans_style.java:72
+msgid "standard"
+msgstr ""
+
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
 #. <space />
 #. <key key="railway" value="monorail" />
-#. item "Transport/Railway/Preserved" label "Edit Preserved Railway"
-#. <space />
-#. <key key="railway" value="preserved" />
-#. item "Transport/Railway/Light Rail" label "Edit Light Rail"
-#. <space />
-#. <key key="railway" value="light_rail" />
-#. item "Transport/Railway/Subway" label "Edit Subway"
-#. <space />
-#. <key key="railway" value="subway" />
-#. item "Transport/Railway/Tram" label "Edit Tram"
-#. <space />
-#. <key key="railway" value="tram" />
+#. <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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231
+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:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "yard"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "siding"
+msgstr ""
+
+#: build/trans_presets.java:1159 build/trans_presets.java:1171
+#: build/trans_presets.java:1183 build/trans_presets.java:1195
+#: build/trans_presets.java:1207 build/trans_presets.java:1219
+#: build/trans_presets.java:1231 build/trans_presets.java:1260
+msgid "spur"
+msgstr ""
+
+#: build/trans_presets.java:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232
+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:1160 build/trans_presets.java:1172
+#: build/trans_presets.java:1184 build/trans_presets.java:1196
+#: build/trans_presets.java:1208 build/trans_presets.java:1220
+#: build/trans_presets.java:1232 build/trans_style.java:756
+#: build/trans_style.java:1182 build/trans_style.java:1246
+#: build/trans_style.java:1254 build/trans_style.java:1263
+#: build/trans_style.java:1271 build/trans_style.java:1279
+#: build/trans_style.java:1280 build/trans_style.java:1287
+msgid "rail"
+msgstr ""
+
+#. item "Man Made/Power Line" text "Line reference"
+#. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
+#: build/trans_presets.java:1161 build/trans_presets.java:1173
+#: build/trans_presets.java:1185 build/trans_presets.java:1197
+#: build/trans_presets.java:1209 build/trans_presets.java:1221
+#: build/trans_presets.java:1233 build/trans_presets.java:2433
+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:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "Frequency (Hz)"
+msgstr ""
+
+#. item "Transport/Railway/Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Narrow Gauge Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Monorail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Preserved" combo "Frequency (Hz)"
+#. item "Transport/Railway/Light Rail" combo "Frequency (Hz)"
+#. item "Transport/Railway/Subway" combo "Frequency (Hz)"
+#. item "Transport/Railway/Tram" combo "Frequency (Hz)"
+#: build/trans_presets.java:1162 build/trans_presets.java:1174
+#: build/trans_presets.java:1186 build/trans_presets.java:1198
+#: build/trans_presets.java:1210 build/trans_presets.java:1222
+#: build/trans_presets.java:1234
+msgid "16.7"
+msgstr ""
+
+#. </optional>
+#: build/trans_presets.java:1165
+msgid "Narrow Gauge Rail"
+msgstr "窄軌"
+
+#. item "Transport/Railway/Narrow Gauge Rail"
+#: build/trans_presets.java:1166
+msgid "Edit Narrow Gauge Rail"
+msgstr "編輯窄軌"
+
+#. </optional>
+#: build/trans_presets.java:1177
+msgid "Monorail"
+msgstr "單軌"
+
+#. item "Transport/Railway/Monorail"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
+#: build/trans_presets.java:1179
+msgid "Edit Monorail"
+msgstr "編輯單軌"
+
+#. </optional>
+#: build/trans_presets.java:1189
+msgid "Preserved"
+msgstr "保留鐵路"
+
+#. item "Transport/Railway/Preserved"
+#: build/trans_presets.java:1190
+msgid "Edit Preserved Railway"
+msgstr "編輯保留的鐵路"
+
+#. </optional>
+#: build/trans_presets.java:1201
+msgid "Light Rail"
+msgstr "輕軌電車"
+
+#. item "Transport/Railway/Light Rail"
+#: build/trans_presets.java:1202
+msgid "Edit Light Rail"
+msgstr "編輯輕軌電車"
+
+#. </optional>
+#: build/trans_presets.java:1213
+msgid "Subway"
+msgstr "地下鐵"
+
+#. item "Transport/Railway/Subway"
+#: build/trans_presets.java:1214
+msgid "Edit Subway"
+msgstr "編輯地下鐵"
+
+#. </optional>
+#: build/trans_presets.java:1225
+msgid "Tram"
+msgstr "路面電車"
+
+#. item "Transport/Railway/Tram"
+#: build/trans_presets.java:1226
+msgid "Edit Tram"
+msgstr "編輯路面電車"
+
+#. </optional>
+#: build/trans_presets.java:1237
+msgid "Bus Guideway"
+msgstr "導軌道巴士"
+
+#. item "Transport/Railway/Bus Guideway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
+#: build/trans_presets.java:1239
+msgid "Edit Bus Guideway"
+msgstr "編輯導軌道巴士"
+
+#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
+#. </optional>
+#. <separator/>
+#: build/trans_presets.java:1256
+msgid "Disused Rail"
+msgstr "不使用的軌道"
+
+#. item "Transport/Railway/Disused Rail"
+#: build/trans_presets.java:1257
+msgid "Edit Disused Railway"
+msgstr "編輯不使用的鐵路"
+
 #. item "Transport/Railway/Disused Rail" label "Edit Disused Railway"
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
+#: build/trans_presets.java:1260
 msgid "Optional Types"
 msgstr "選擇性的類型"
 
-#. item "Transport/Railway/Rail" combo "Optional Types"
-#. item "Transport/Railway/Narrow Gauge Rail" combo "Optional Types"
-#. item "Transport/Railway/Monorail" combo "Optional Types"
-#. item "Transport/Railway/Preserved" combo "Optional Types"
-#. item "Transport/Railway/Light Rail" combo "Optional Types"
-#. item "Transport/Railway/Subway" combo "Optional Types"
-#. item "Transport/Railway/Tram" combo "Optional Types"
-#. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "yard"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "siding"
-msgstr ""
-
-#: build/trans_presets.java:1129 build/trans_presets.java:1135
-#: build/trans_presets.java:1142 build/trans_presets.java:1148
-#: build/trans_presets.java:1154 build/trans_presets.java:1160
-#: build/trans_presets.java:1166 build/trans_presets.java:1191
-msgid "spur"
-msgstr ""
-
-#: build/trans_presets.java:1131
-msgid "Narrow Gauge Rail"
-msgstr "窄軌"
-
-#. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1132
-msgid "Edit Narrow Gauge Rail"
-msgstr "編輯窄軌"
-
-#: build/trans_presets.java:1137
-msgid "Monorail"
-msgstr "單軌"
-
-#. item "Transport/Railway/Monorail"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1139
-msgid "Edit Monorail"
-msgstr "編輯單軌"
-
-#: build/trans_presets.java:1144
-msgid "Preserved"
-msgstr "保留鐵路"
-
-#. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1145
-msgid "Edit Preserved Railway"
-msgstr "編輯保留的鐵路"
-
-#: build/trans_presets.java:1150
-msgid "Light Rail"
-msgstr "輕軌電車"
-
-#. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1151
-msgid "Edit Light Rail"
-msgstr "編輯輕軌電車"
-
-#: build/trans_presets.java:1156
-msgid "Subway"
-msgstr "地下鐵"
-
-#. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1157
-msgid "Edit Subway"
-msgstr "編輯地下鐵"
-
-#: build/trans_presets.java:1162
-msgid "Tram"
-msgstr "路面電車"
-
-#. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1163
-msgid "Edit Tram"
-msgstr "編輯路面電車"
-
-#: build/trans_presets.java:1168
-msgid "Bus Guideway"
-msgstr "導軌道巴士"
-
-#. item "Transport/Railway/Bus Guideway"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1170
-msgid "Edit Bus Guideway"
-msgstr "編輯導軌道巴士"
-
-#. item "Transport/Railway/Bus Guideway" text "Width (meters)"
-#. </optional>
-#. <separator/>
-#: build/trans_presets.java:1187
-msgid "Disused Rail"
-msgstr "不使用的軌道"
-
-#. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1188
-msgid "Edit Disused Railway"
-msgstr "編輯不使用的鐵路"
-
-#: build/trans_presets.java:1193
+#: build/trans_presets.java:1262
 msgid "Abandoned Rail"
 msgstr "廢棄的軌道"
@@ -20007,5 +20557,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1197
+#: build/trans_presets.java:1266
 msgid "Level Crossing"
 msgstr "鐵路平交道"
@@ -20014,5 +20564,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1201
+#: build/trans_presets.java:1270
 msgid "Crossing"
 msgstr "平交道"
@@ -20022,5 +20572,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1205
+#: build/trans_presets.java:1274
 msgid "Crossing type"
 msgstr "平交道類型"
@@ -20028,5 +20578,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1211
+#: build/trans_presets.java:1280
 msgid "Turntable"
 msgstr "調車轉盤"
@@ -20035,10 +20585,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1284
+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:1289
 msgid "Aerialway"
 msgstr "空中路線"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1217
+#: build/trans_presets.java:1290
 msgid "Chair Lift"
 msgstr "滑雪纜車"
@@ -20046,10 +20603,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1219
+#: build/trans_presets.java:1292
 msgid "Edit Chair Lift"
 msgstr "編輯滑雪纜車"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1223
+#: build/trans_presets.java:1296
 msgid "Drag Lift"
 msgstr ""
@@ -20057,10 +20614,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1225
+#: build/trans_presets.java:1298
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1229
+#: build/trans_presets.java:1302
 msgid "Cable Car"
 msgstr "纜車"
@@ -20068,10 +20625,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1231
+#: build/trans_presets.java:1304
 msgid "Edit Cable Car"
 msgstr "編輯纜車"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1235
+#: build/trans_presets.java:1308
 msgid "Gondola"
 msgstr ""
@@ -20079,10 +20636,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1237
+#: build/trans_presets.java:1310
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1314
 msgctxt "aerialway"
 msgid "Station"
@@ -20090,12 +20647,25 @@
 
 #. item "Aerialway/Station"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps" />
-#: build/trans_presets.java:1243
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1316
 msgctxt "aerialway"
 msgid "Edit Station"
 msgstr ""
 
+#. item "Aerialway/Station" text "Name"
+#: build/trans_presets.java:1320
+msgctxt "aerialway"
+msgid "Pylon"
+msgstr ""
+
+#. item "Aerialway/Pylon"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
+#: build/trans_presets.java:1322
+msgctxt "aerialway"
+msgid "Edit Pylon"
+msgstr ""
+
 #. group "Car"
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:1329
 msgid "Fuel"
 msgstr "加油站"
@@ -20105,9 +20675,66 @@
 #. 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:1254
+#: build/trans_presets.java:1333
 msgid "Edit Fuel"
 msgstr "編輯加油站"
 
-#. item "Car/Fuel" text "Operator"
+#. item "Car/Fuel" combo "Operator"
+#: build/trans_presets.java:1335
+msgid "Agip"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Aral"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Avia"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "BP"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Esso"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "OMV"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Q8"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Repsol"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Shell"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Statoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Tamoil"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Texaco"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Total"
+msgstr ""
+
+#: build/trans_presets.java:1335
+msgid "Indipend."
+msgstr ""
+
+#. item "Car/Fuel" text "Name"
 #. item "Food+Drinks/Cafe" text "Name"
 #. item "Food+Drinks/Pub" text "Name"
@@ -20161,32 +20788,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1536 build/trans_presets.java:1543
-#: build/trans_presets.java:1551 build/trans_presets.java:1564
-#: build/trans_presets.java:1578 build/trans_presets.java:1675
-#: build/trans_presets.java:1683 build/trans_presets.java:1786
-#: build/trans_presets.java:1792 build/trans_presets.java:2105
-#: build/trans_presets.java:2129 build/trans_presets.java:2357
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1691 build/trans_presets.java:1698
+#: build/trans_presets.java:1706 build/trans_presets.java:1719
+#: build/trans_presets.java:1733 build/trans_presets.java:1830
+#: build/trans_presets.java:1838 build/trans_presets.java:1941
+#: build/trans_presets.java:1947 build/trans_presets.java:2260
+#: build/trans_presets.java:2284 build/trans_presets.java:2525
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Opening Hours"
 msgstr ""
@@ -20245,94 +20872,170 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1258 build/trans_presets.java:1486
-#: build/trans_presets.java:1494 build/trans_presets.java:1501
-#: build/trans_presets.java:1508 build/trans_presets.java:1514
-#: build/trans_presets.java:1521 build/trans_presets.java:1528
-#: build/trans_presets.java:1543 build/trans_presets.java:1551
-#: build/trans_presets.java:1564 build/trans_presets.java:1578
-#: build/trans_presets.java:1675 build/trans_presets.java:1683
-#: build/trans_presets.java:1786 build/trans_presets.java:1792
-#: build/trans_presets.java:2105 build/trans_presets.java:2129
-#: build/trans_presets.java:2379 build/trans_presets.java:2385
-#: build/trans_presets.java:2392 build/trans_presets.java:2399
-#: build/trans_presets.java:2405 build/trans_presets.java:2411
-#: build/trans_presets.java:2433 build/trans_presets.java:2440
-#: build/trans_presets.java:2447 build/trans_presets.java:2453
-#: build/trans_presets.java:2460 build/trans_presets.java:2466
-#: build/trans_presets.java:2472 build/trans_presets.java:2478
-#: build/trans_presets.java:2484 build/trans_presets.java:2490
-#: build/trans_presets.java:2497 build/trans_presets.java:2504
-#: build/trans_presets.java:2511 build/trans_presets.java:2517
-#: build/trans_presets.java:2523 build/trans_presets.java:2529
-#: build/trans_presets.java:2535 build/trans_presets.java:2541
-#: build/trans_presets.java:2548 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2585
-#: build/trans_presets.java:2593 build/trans_presets.java:2608
-#: build/trans_presets.java:2614 build/trans_presets.java:2622
-#: build/trans_presets.java:2649
+#: build/trans_presets.java:1338 build/trans_presets.java:1641
+#: build/trans_presets.java:1649 build/trans_presets.java:1656
+#: build/trans_presets.java:1663 build/trans_presets.java:1669
+#: build/trans_presets.java:1676 build/trans_presets.java:1683
+#: build/trans_presets.java:1698 build/trans_presets.java:1706
+#: build/trans_presets.java:1719 build/trans_presets.java:1733
+#: build/trans_presets.java:1830 build/trans_presets.java:1838
+#: build/trans_presets.java:1941 build/trans_presets.java:1947
+#: build/trans_presets.java:2260 build/trans_presets.java:2284
+#: build/trans_presets.java:2547 build/trans_presets.java:2553
+#: build/trans_presets.java:2560 build/trans_presets.java:2567
+#: build/trans_presets.java:2573 build/trans_presets.java:2579
+#: build/trans_presets.java:2601 build/trans_presets.java:2608
+#: build/trans_presets.java:2615 build/trans_presets.java:2621
+#: build/trans_presets.java:2628 build/trans_presets.java:2634
+#: build/trans_presets.java:2640 build/trans_presets.java:2646
+#: build/trans_presets.java:2652 build/trans_presets.java:2658
+#: build/trans_presets.java:2665 build/trans_presets.java:2672
+#: build/trans_presets.java:2679 build/trans_presets.java:2685
+#: build/trans_presets.java:2691 build/trans_presets.java:2697
+#: build/trans_presets.java:2703 build/trans_presets.java:2709
+#: build/trans_presets.java:2716 build/trans_presets.java:2723
+#: build/trans_presets.java:2730 build/trans_presets.java:2736
+#: build/trans_presets.java:2742 build/trans_presets.java:2753
+#: build/trans_presets.java:2761 build/trans_presets.java:2776
+#: build/trans_presets.java:2782 build/trans_presets.java:2790
+#: build/trans_presets.java:2817
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1339
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1340
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1341
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1342
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1343
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1344
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1345
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1346
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1347
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1348
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
+#: build/trans_presets.java:1349
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
+#: build/trans_presets.java:1350
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
+#: build/trans_presets.java:1351
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
+#: build/trans_presets.java:1352
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
+#: build/trans_presets.java:1353
+msgid "1/50 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/50 mix (mofa/moped)"
+#. </optional>
 #. group "Bicycle"
 #. <button label="Village/City" hotkey="V" icon="styles/standard/place.png">
@@ -20344,5 +21047,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1260 build/trans_presets.java:1306
+#: build/trans_presets.java:1356 build/trans_presets.java:1402
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -20352,5 +21055,5 @@
 #. <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:1263
+#: build/trans_presets.java:1359
 msgid "Edit Parking"
 msgstr "編輯停車場"
@@ -20361,25 +21064,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1266 build/trans_presets.java:1627
-#: build/trans_presets.java:1637 build/trans_presets.java:2287
-#: build/trans_presets.java:2419
+#: build/trans_presets.java:1362 build/trans_presets.java:1782
+#: build/trans_presets.java:1792 build/trans_presets.java:2444
+#: build/trans_presets.java:2587
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "multi-storey"
 msgstr "塔式"
 
-#: build/trans_presets.java:1267
+#: build/trans_presets.java:1363
 msgid "surface"
 msgstr "平面式"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1267 build/trans_presets.java:2199
+#: build/trans_presets.java:1363 build/trans_presets.java:2354
 msgid "underground"
 msgstr "地下"
 
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1364
 msgid "Park and Ride"
 msgstr ""
@@ -20388,48 +21091,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1269 build/trans_presets.java:1628
-#: build/trans_presets.java:1638 build/trans_presets.java:2288
+#: build/trans_presets.java:1365 build/trans_presets.java:1783
+#: build/trans_presets.java:1793 build/trans_presets.java:2445
 msgid "Fee"
 msgstr "費用"
 
 #. <space />
-#: build/trans_presets.java:1271
+#: build/trans_presets.java:1367
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1368
 msgid "Spaces for Disabled"
 msgstr "殘障專用空間"
 
-#: build/trans_presets.java:1273
+#: build/trans_presets.java:1369
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1274
+#: build/trans_presets.java:1370
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1275
+#: build/trans_presets.java:1371
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:1373
 msgid "Wash"
 msgstr "洗車場"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:1374
 msgid "Edit Car Wash"
 msgstr "編輯"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1283
+#: build/trans_presets.java:1379
 msgid "Repair"
 msgstr "修車場"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1284
+#: build/trans_presets.java:1380
 msgid "Edit Car Repair"
 msgstr "編輯修車場"
@@ -20437,5 +21140,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1289 build/trans_presets.java:1313
+#: build/trans_presets.java:1385 build/trans_presets.java:1409
 msgid "Rental"
 msgstr "租車"
@@ -20444,10 +21147,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1388
 msgid "Edit Car Rental"
 msgstr "編輯租車"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1297
+#: build/trans_presets.java:1393
 msgid "Sharing"
 msgstr ""
@@ -20455,5 +21158,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1299
+#: build/trans_presets.java:1395
 msgid "Edit Car Sharing"
 msgstr ""
@@ -20461,10 +21164,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1308
+#: build/trans_presets.java:1404
 msgid "Edit Bicycle Parking"
 msgstr "編輯自行車停車場"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1311
+#: build/trans_presets.java:1407
 msgid "Capacity"
 msgstr "容量"
@@ -20473,15 +21176,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1412
 msgid "Edit Bicycle Rental"
 msgstr "編輯自行車租用點"
 
 #. item "Bicycle/Rental" text "Name"
-#: build/trans_presets.java:1321
+#: build/trans_presets.java:1417
 msgid "Public Transport"
 msgstr "大眾運輸"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1418
 msgctxt "railway"
 msgid "Station"
@@ -20491,5 +21194,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1325
+#: build/trans_presets.java:1421
 msgctxt "railway"
 msgid "Edit Station"
@@ -20497,5 +21200,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1426
 msgid "UIC-Reference"
 msgstr ""
@@ -20503,5 +21206,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1333
+#: build/trans_presets.java:1429
 msgid "Railway Halt"
 msgstr ""
@@ -20509,5 +21212,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1431
 msgid "Edit Halt"
 msgstr ""
@@ -20515,5 +21218,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1438
 msgid "Tram Stop"
 msgstr "路面電車停靠"
@@ -20522,5 +21225,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1441
 msgid "Edit Tram Stop"
 msgstr "編輯路面電車停靠"
@@ -20528,5 +21231,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1448
 msgid "Railway Platform"
 msgstr "鐵路月台"
@@ -20535,5 +21238,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1451
 msgid "Edit Railway Platform"
 msgstr "編輯鐵路月台"
@@ -20545,5 +21248,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1358 build/trans_presets.java:1403
+#: build/trans_presets.java:1454 build/trans_presets.java:1499
 msgid "Reference (track number)"
 msgstr ""
@@ -20551,10 +21254,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1360 build/trans_presets.java:1405
+#: build/trans_presets.java:1456 build/trans_presets.java:1501
 msgid "Area"
 msgstr "區域"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1362
+#: build/trans_presets.java:1458
 msgid "Subway Entrance"
 msgstr "地下鐵入口"
@@ -20563,10 +21266,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1461
 msgid "Edit Subway Entrance"
 msgstr "編輯地下鐵入口"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1370 build/trans_presets.java:2289
+#: build/trans_presets.java:1466 build/trans_presets.java:2446
 msgid "Wheelchair"
 msgstr ""
@@ -20575,5 +21278,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1471
 msgid "Bus Station"
 msgstr "公車車站"
@@ -20582,5 +21285,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1378
+#: build/trans_presets.java:1474
 msgid "Edit Bus Station"
 msgstr "編輯公車車站"
@@ -20588,5 +21291,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1384
+#: build/trans_presets.java:1480
 msgid "Bus Stop"
 msgstr "公車站牌"
@@ -20596,5 +21299,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1388
+#: build/trans_presets.java:1484
 msgid "Edit Bus Stop"
 msgstr "編輯公車站牌"
@@ -20603,25 +21306,26 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1393 build/trans_presets.java:1650
-#: build/trans_presets.java:2334
+#: build/trans_presets.java:1489 build/trans_presets.java:1805
+#: build/trans_presets.java:2496
 msgid "Shelter"
 msgstr ""
 
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:1394 build/trans_presets.java:2322
+#. item "Amenities/Waste Basket" label "Edit Waste Basket"
+#. <key key="amenity" value="waste_basket" />
+#: build/trans_presets.java:1490 build/trans_presets.java:2484
 msgid "Bench"
 msgstr "長椅"
 
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1491
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1399
+#: build/trans_presets.java:1495
 msgid "Bus Platform"
 msgstr "公車月台"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1400
+#: build/trans_presets.java:1496
 msgid "Edit Bus Platform"
 msgstr "編輯公車月台"
@@ -20629,5 +21333,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1408
+#: build/trans_presets.java:1504
 msgid "Taxi"
 msgstr "計程車"
@@ -20635,5 +21339,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1410
+#: build/trans_presets.java:1506
 msgid "Edit Taxi station"
 msgstr "編輯計程車招呼站"
@@ -20641,32 +21345,127 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1415
+#: build/trans_presets.java:1512
 msgid "Airport"
 msgstr "機場"
 
-#. item "Public Transport/Airport"
+#. group "Airport"
+#: build/trans_presets.java:1513
+msgid "Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1417
-msgid "Edit Airport"
-msgstr "編輯機場"
-
-#. item "Public Transport/Airport" text "Reference"
-#: build/trans_presets.java:1422
+#: build/trans_presets.java:1515
+msgid "Edit Airport Ground"
+msgstr ""
+
+#. item "Airport/Airport Ground" text "Name"
+#. <optional>
+#: build/trans_presets.java:1519
 msgid "IATA"
 msgstr ""
 
-#. item "Public Transport/Airport" text "IATA"
-#: build/trans_presets.java:1423
+#. item "Airport/Airport Ground" text "IATA"
+#: build/trans_presets.java:1520
 msgid "ICAO"
 msgstr ""
 
-#. item "Public Transport/Airport" text "ICAO"
+#. item "Airport/Airport Ground" text "ICAO"
 #. </optional>
-#: build/trans_presets.java:1428
+#. <separator/>
+#: build/trans_presets.java:1524
+msgid "Runway"
+msgstr ""
+
+#. item "Airport/Runway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
+#: build/trans_presets.java:1526
+msgid "Edit Runway"
+msgstr ""
+
+#. item "Airport/Runway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1532
+msgid "Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
+#: build/trans_presets.java:1534
+msgid "Edit Taxiway"
+msgstr ""
+
+#. item "Airport/Taxiway" text "Reference"
+#. </optional>
+#: build/trans_presets.java:1540
+msgid "Helipad"
+msgstr ""
+
+#. item "Airport/Helipad"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
+#: build/trans_presets.java:1542
+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:1548 build/trans_presets.java:1550
+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:1553 build/trans_presets.java:1555
+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:1558 build/trans_presets.java:1560
+#: build/trans_presets.java:2370
+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:1563 build/trans_presets.java:1565
+msgid "Windsock"
+msgstr ""
+
+#. item "Airport/Windsock" label "Windsock"
+#. <key key="aeroway" value="windsock" />
+#. <separator/>
+#: build/trans_presets.java:1569
+msgid "Terminal"
+msgstr ""
+
+#. item "Airport/Terminal"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
+#: build/trans_presets.java:1571
+msgid "Edit Terminal"
+msgstr ""
+
+#. item "Airport/Gate"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1577
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1583
 msgid "Travel"
 msgstr "旅遊"
 
 #. group "Travel"
-#: build/trans_presets.java:1429
+#: build/trans_presets.java:1584
 msgid "Accomodation"
 msgstr "住宿"
@@ -20678,5 +21477,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1430 build/trans_surveyor.java:43
+#: build/trans_presets.java:1585 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "旅館"
@@ -20685,15 +21484,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1588
 msgid "Edit Hotel"
 msgstr "編輯旅館"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1436
+#: build/trans_presets.java:1591
 msgid "Stars"
 msgstr "星級"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1438
+#: build/trans_presets.java:1593
 msgid "Motel"
 msgstr "汽車旅館"
@@ -20701,20 +21500,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1595
 msgid "Edit Motel"
 msgstr "編輯汽車旅館"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1444
+#: build/trans_presets.java:1599
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1445
+#: build/trans_presets.java:1600
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1449
+#: build/trans_presets.java:1604
 msgid "Chalet"
 msgstr ""
@@ -20722,10 +21521,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1451
+#: build/trans_presets.java:1606
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1455
+#: build/trans_presets.java:1610
 msgid "Hostel"
 msgstr ""
@@ -20733,30 +21532,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1457
+#: build/trans_presets.java:1612
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1461
+#: build/trans_presets.java:1616
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1462
+#: build/trans_presets.java:1617
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1467
+#: build/trans_presets.java:1622
 msgid "Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1468
+#: build/trans_presets.java:1623
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1472
+#: build/trans_presets.java:1627
 msgid "Camping Site"
 msgstr "露營區"
@@ -20764,10 +21563,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1474
+#: build/trans_presets.java:1629
 msgid "Edit Camping Site"
 msgstr "編輯露營區"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1479
+#: build/trans_presets.java:1634
 msgid "Food+Drinks"
 msgstr "食物+飲料"
@@ -20778,5 +21577,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1480 build/trans_surveyor.java:47
+#: build/trans_presets.java:1635 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "餐廳"
@@ -20784,5 +21583,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1637
 msgid "Edit Restaurant"
 msgstr "編輯餐廳"
@@ -20790,5 +21589,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "Cuisine"
 msgstr "烹調風格"
@@ -20796,61 +21595,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "italian"
 msgstr "意大利文"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "chinese"
 msgstr "中文"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "pizza"
 msgstr "披薩"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "burger"
 msgstr "漢堡"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "greek"
 msgstr "希臘文"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "german"
 msgstr "德文"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "indian"
 msgstr "印度料理"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "regional"
 msgstr "地方料理"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "turkish"
 msgstr "土耳其料理"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "asian"
 msgstr "亞洲料理"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "thai"
 msgstr "泰文"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "mexican"
 msgstr "墨西哥料理"
 
-#: build/trans_presets.java:1485 build/trans_presets.java:1493
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
 msgid "japanese"
 msgstr "日文"
 
-#: build/trans_presets.java:1488
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "french"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sandwich"
+msgstr ""
+
+#: build/trans_presets.java:1640 build/trans_presets.java:1648
+msgid "sushi"
+msgstr ""
+
+#: build/trans_presets.java:1643
 msgid "Fast Food"
 msgstr "速食"
@@ -20858,9 +21669,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1490
+#: build/trans_presets.java:1645
 msgid "Edit Fast Food Restaurant"
 msgstr "編輯速食餐廳"
 
-#: build/trans_presets.java:1496
+#: build/trans_presets.java:1648
+msgid "fish_and_chips"
+msgstr ""
+
+#: build/trans_presets.java:1648
+msgid "chicken"
+msgstr ""
+
+#: build/trans_presets.java:1651
 msgid "Cafe"
 msgstr "咖啡"
@@ -20868,9 +21687,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1653
 msgid "Edit Cafe"
 msgstr "編輯咖啡廳"
 
-#: build/trans_presets.java:1503
+#: build/trans_presets.java:1658
 msgid "Pub"
 msgstr "酒店"
@@ -20878,18 +21697,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1505
+#: build/trans_presets.java:1660
 msgid "Edit Pub"
 msgstr "編輯酒店"
 
-#: build/trans_presets.java:1510
+#: build/trans_presets.java:1665
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1511
+#: build/trans_presets.java:1666
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1516
+#: build/trans_presets.java:1671
 msgid "Bar"
 msgstr "酒吧"
@@ -20897,9 +21716,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1518
+#: build/trans_presets.java:1673
 msgid "Edit Bar"
 msgstr "編輯酒吧"
 
-#: build/trans_presets.java:1523
+#: build/trans_presets.java:1678
 msgid "Nightclub"
 msgstr "夜店"
@@ -20907,24 +21726,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1525
+#: build/trans_presets.java:1680
 msgid "Edit Nightclub"
 msgstr "編輯夜店"
 
-#: build/trans_presets.java:1531
+#: build/trans_presets.java:1686
 msgid "Tourism"
 msgstr "旅遊相關"
 
 #. group "Tourism"
-#: build/trans_presets.java:1532
+#: build/trans_presets.java:1687
 msgid "Attraction"
 msgstr "吸引力點"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1533
+#: build/trans_presets.java:1688
 msgid "Edit Attraction"
 msgstr "編輯吸引力點"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1538
+#: build/trans_presets.java:1693
 msgid "Museum"
 msgstr "博物館"
@@ -20932,9 +21751,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1540
+#: build/trans_presets.java:1695
 msgid "Edit Museum"
 msgstr "編輯博物館"
 
-#: build/trans_presets.java:1545
+#: build/trans_presets.java:1700
 msgid "Zoo"
 msgstr "動物園"
@@ -20943,9 +21762,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:1548
+#: build/trans_presets.java:1703
 msgid "Edit Zoo"
 msgstr "編輯動物園"
 
-#: build/trans_presets.java:1553
+#: build/trans_presets.java:1708
 msgid "Viewpoint"
 msgstr "景點"
@@ -20953,24 +21772,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1555
+#: build/trans_presets.java:1710
 msgid "Edit Viewpoint"
 msgstr "編輯景點"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1558
+#: build/trans_presets.java:1713
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1560
+#: build/trans_presets.java:1715
 msgid "Theme Park"
 msgstr "主題樂園"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1561
+#: build/trans_presets.java:1716
 msgid "Edit Theme Park"
 msgstr "編輯主題樂園"
 
-#: build/trans_presets.java:1566
+#: build/trans_presets.java:1721
 msgid "Artwork"
 msgstr "藝術工作"
@@ -20978,5 +21797,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1568
+#: build/trans_presets.java:1723
 msgid "Edit Artwork"
 msgstr "編輯藝術工作"
@@ -20984,19 +21803,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1728
 msgid "Information Office"
 msgstr "資訊服務處"
 
-#: build/trans_presets.java:1580
+#: build/trans_presets.java:1735
 msgid "Map"
 msgstr "地圖"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "topo"
 msgstr ""
@@ -21034,5 +21853,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1585 build/trans_style.java:625
+#: build/trans_presets.java:1740 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -21040,28 +21859,28 @@
 msgstr "街"
 
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1740
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "city"
 msgstr "城市"
 
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1741
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1587 build/trans_presets.java:1603
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1742 build/trans_presets.java:1758
+#: build/trans_presets.java:1802
 msgid "Closer Description"
 msgstr ""
@@ -21071,5 +21890,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1589 build/trans_presets.java:1612
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Routes shown for:"
 msgstr ""
@@ -21077,5 +21896,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1590 build/trans_presets.java:1613
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "Hiking"
 msgstr "健走"
@@ -21083,6 +21902,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1591 build/trans_presets.java:1614
-#: build/trans_presets.java:1832
+#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1987
 msgid "Cycling"
 msgstr "自行車"
@@ -21090,5 +21909,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1592 build/trans_presets.java:1615
+#: build/trans_presets.java:1747 build/trans_presets.java:1770
 msgid "Mountainbiking"
 msgstr ""
@@ -21096,6 +21915,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1593 build/trans_presets.java:1616
-#: build/trans_presets.java:1886
+#: build/trans_presets.java:1748 build/trans_presets.java:1771
+#: build/trans_presets.java:2041
 msgid "Skiing"
 msgstr "滑雪"
@@ -21103,5 +21922,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1594 build/trans_presets.java:1617
+#: build/trans_presets.java:1749 build/trans_presets.java:1772
 msgid "Riding"
 msgstr ""
@@ -21109,46 +21928,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1595 build/trans_presets.java:1618
+#: build/trans_presets.java:1750 build/trans_presets.java:1773
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1752
 msgid "Information Board"
 msgstr "資訊板"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "history"
 msgstr "歷史"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "nature"
 msgstr "自然"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "wildlife"
 msgstr "野生"
 
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1757
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1605
+#: build/trans_presets.java:1760
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1620
+#: build/trans_presets.java:1775
 msgid "Information Terminal"
 msgstr ""
@@ -21156,29 +21975,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1625 build/trans_presets.java:1635
+#: build/trans_presets.java:1780 build/trans_presets.java:1790
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1630
+#: build/trans_presets.java:1785
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1640
+#: build/trans_presets.java:1795
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1641
+#: build/trans_presets.java:1796
 msgid "Phone number"
 msgstr "電話號碼"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1643
+#: build/trans_presets.java:1798
 msgid "Other Information Points"
 msgstr "其他的資訊點"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1651
+#: build/trans_presets.java:1806
 msgid "Edit Shelter"
 msgstr ""
@@ -21186,25 +22005,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1654 build/trans_presets.java:1660
+#: build/trans_presets.java:1809 build/trans_presets.java:1815
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1656
+#: build/trans_presets.java:1811
 msgid "Picnic Site"
 msgstr "野餐區"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1657
+#: build/trans_presets.java:1812
 msgid "Edit Picnic Site"
 msgstr "編輯野餐區"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1663
+#: build/trans_presets.java:1818
 msgid "Historic Places"
 msgstr "歷史地區"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1664
+#: build/trans_presets.java:1819
 msgid "Castle"
 msgstr "城堡"
@@ -21213,19 +22032,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:1667
+#: build/trans_presets.java:1822
 msgid "Edit Castle"
 msgstr "編輯城堡"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1671
+#: build/trans_presets.java:1826
 msgid "Ruins"
 msgstr "遺跡"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1672
+#: build/trans_presets.java:1827
 msgid "Edit Ruins"
 msgstr "編輯遺跡"
 
-#: build/trans_presets.java:1677
+#: build/trans_presets.java:1832
 msgid "Archaeological Site"
 msgstr "考古學地區"
@@ -21234,9 +22053,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:1680
+#: build/trans_presets.java:1835
 msgid "Edit Archaeological Site"
 msgstr "編輯考古學地區"
 
-#: build/trans_presets.java:1685
+#: build/trans_presets.java:1840
 msgid "Battlefield"
 msgstr "戰場"
@@ -21244,10 +22063,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1687
+#: build/trans_presets.java:1842
 msgid "Edit Battlefield"
 msgstr "編輯戰場"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1691
+#: build/trans_presets.java:1846
 msgid "Palaeontological Site"
 msgstr ""
@@ -21255,5 +22074,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1693
+#: build/trans_presets.java:1848
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -21261,15 +22080,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1698
+#: build/trans_presets.java:1853
 msgid "Monument"
 msgstr "紀念建築"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1699
+#: build/trans_presets.java:1854
 msgid "Edit Monument"
 msgstr "編輯紀念建築"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1703
+#: build/trans_presets.java:1858
 msgid "Memorial"
 msgstr "紀念碑"
@@ -21277,55 +22096,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1860
 msgid "Edit Memorial"
 msgstr "編輯紀念碑"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1709
+#: build/trans_presets.java:1864
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1714
+#: build/trans_presets.java:1869
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1870
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1719
+#: build/trans_presets.java:1874
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1720
+#: build/trans_presets.java:1875
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1880
 msgid "Leisure"
 msgstr "休閒"
 
 #. group "Leisure"
-#: build/trans_presets.java:1726
+#: build/trans_presets.java:1881
 msgid "Water Park"
 msgstr "水上樂園"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1727
+#: build/trans_presets.java:1882
 msgid "Edit Water Park"
 msgstr "編輯水上樂園"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1731
+#: build/trans_presets.java:1886
 msgid "Playground"
 msgstr "運動場"
@@ -21333,35 +22152,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1733
+#: build/trans_presets.java:1888
 msgid "Edit Playground"
 msgstr "編輯運動場"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1892
 msgid "Fishing"
 msgstr "釣魚"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1738
+#: build/trans_presets.java:1893
 msgid "Edit Fishing"
 msgstr "編輯釣魚場"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:2564
+#: build/trans_presets.java:1899 build/trans_presets.java:2732
 msgid "Sports"
 msgstr "運動用品"
 
 #. group "Sports"
-#: build/trans_presets.java:1745
+#: build/trans_presets.java:1900
 msgid "Sport Facilities"
 msgstr "運動設施"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1746
+#: build/trans_presets.java:1901
 msgid "Stadium"
 msgstr "競技場"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1747
+#: build/trans_presets.java:1902
 msgid "Edit Stadium"
 msgstr "編輯競技揚"
@@ -21375,6 +22194,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1751 build/trans_presets.java:1760
-#: build/trans_presets.java:1769 build/trans_presets.java:1778
+#: build/trans_presets.java:1906 build/trans_presets.java:1915
+#: build/trans_presets.java:1924 build/trans_presets.java:1933
 msgid "select sport:"
 msgstr "選擇運動："
@@ -21766,6 +22585,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -21799,225 +22618,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "multi"
 msgstr "多種"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "archery"
 msgstr "射箭"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "athletics"
 msgstr "田徑"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "australian_football"
 msgstr "澳洲足球"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "baseball"
 msgstr "棒球"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "basketball"
 msgstr "籃球"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "bowls"
 msgstr "保齡球"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "canoe"
 msgstr "獨木舟"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "climbing"
 msgstr "攀岩"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "croquet"
 msgstr "木球"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "cycling"
 msgstr "自行車"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "dog_racing"
 msgstr "賽狗"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "equestrian"
 msgstr "馬術"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "football"
 msgstr "美式足球"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "golf"
 msgstr "高爾夫"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "gymnastics"
 msgstr "體操"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "hockey"
 msgstr "曲棍球"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "horse_racing"
 msgstr "賽馬"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "motor"
 msgstr "摩托車"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "rugby"
 msgstr "橄欖球"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "shooting"
 msgstr "射擊"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "skiing"
 msgstr "滑雪"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "soccer"
 msgstr "足球"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "swimming"
 msgstr "游泳"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "table_tennis"
 msgstr "桌球"
 
-#: build/trans_presets.java:1753 build/trans_presets.java:1762
-#: build/trans_presets.java:1771 build/trans_presets.java:1780
+#: build/trans_presets.java:1908 build/trans_presets.java:1917
+#: build/trans_presets.java:1926 build/trans_presets.java:1935
 msgid "tennis"
 msgstr "網球"
 
-#: build/trans_presets.java:1755
+#: build/trans_presets.java:1910
 msgid "Sports Centre"
 msgstr "運動中心"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1756
+#: build/trans_presets.java:1911
 msgid "Edit Sports Centre"
 msgstr "編輯運動中心"
 
-#: build/trans_presets.java:1764
+#: build/trans_presets.java:1919
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1765
+#: build/trans_presets.java:1920
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1773
+#: build/trans_presets.java:1928
 msgid "Racetrack"
 msgstr "跑道"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1774
+#: build/trans_presets.java:1929
 msgid "Edit Racetrack"
 msgstr "編輯跑道"
 
-#: build/trans_presets.java:1782
+#: build/trans_presets.java:1937
 msgid "Golf Course"
 msgstr "高爾夫路線"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1783
+#: build/trans_presets.java:1938
 msgid "Edit Golf Course"
 msgstr "編輯高爾夫路線"
 
-#: build/trans_presets.java:1788
+#: build/trans_presets.java:1943
 msgid "Miniature Golf"
 msgstr "迷你高爾夫"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1789
+#: build/trans_presets.java:1944
 msgid "Edit Miniature Golf"
 msgstr "編輯迷你高爾夫"
 
-#: build/trans_presets.java:1795
+#: build/trans_presets.java:1950
 msgid "Sport"
 msgstr "運動"
 
 #. group "Sport"
-#: build/trans_presets.java:1796
+#: build/trans_presets.java:1951
 msgid "Multi"
 msgstr "多種"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1952
 msgid "Edit Multi"
 msgstr "編輯多種"
@@ -22056,21 +22875,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "type"
 msgstr "類型"
@@ -22109,203 +22928,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "sports_centre"
 msgstr "運動中心"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "stadium"
 msgstr "競技揚"
 
-#: build/trans_presets.java:1800 build/trans_presets.java:1806
-#: build/trans_presets.java:1812 build/trans_presets.java:1818
-#: build/trans_presets.java:1824 build/trans_presets.java:1830
-#: build/trans_presets.java:1836 build/trans_presets.java:1842
-#: build/trans_presets.java:1848 build/trans_presets.java:1854
-#: build/trans_presets.java:1860 build/trans_presets.java:1866
-#: build/trans_presets.java:1872 build/trans_presets.java:1878
-#: build/trans_presets.java:1884 build/trans_presets.java:1893
-#: build/trans_presets.java:1900 build/trans_presets.java:1908
-#: build/trans_presets.java:1914 build/trans_presets.java:1920
-#: build/trans_presets.java:1926 build/trans_presets.java:1932
-#: build/trans_presets.java:1938 build/trans_presets.java:1944
-#: build/trans_presets.java:1950 build/trans_presets.java:1956
-#: build/trans_presets.java:1962 build/trans_presets.java:1968
-#: build/trans_presets.java:1974 build/trans_presets.java:1980
-#: build/trans_presets.java:1986 build/trans_presets.java:1992
-#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:1955 build/trans_presets.java:1961
+#: build/trans_presets.java:1967 build/trans_presets.java:1973
+#: build/trans_presets.java:1979 build/trans_presets.java:1985
+#: build/trans_presets.java:1991 build/trans_presets.java:1997
+#: build/trans_presets.java:2003 build/trans_presets.java:2009
+#: build/trans_presets.java:2015 build/trans_presets.java:2021
+#: build/trans_presets.java:2027 build/trans_presets.java:2033
+#: build/trans_presets.java:2039 build/trans_presets.java:2048
+#: build/trans_presets.java:2055 build/trans_presets.java:2063
+#: build/trans_presets.java:2069 build/trans_presets.java:2075
+#: build/trans_presets.java:2081 build/trans_presets.java:2087
+#: build/trans_presets.java:2093 build/trans_presets.java:2099
+#: build/trans_presets.java:2105 build/trans_presets.java:2111
+#: build/trans_presets.java:2117 build/trans_presets.java:2123
+#: build/trans_presets.java:2129 build/trans_presets.java:2135
+#: build/trans_presets.java:2141 build/trans_presets.java:2147
+#: build/trans_presets.java:2153 build/trans_presets.java:2159
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1802
+#: build/trans_presets.java:1957
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1803
+#: build/trans_presets.java:1958
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1963
 msgid "Athletics"
 msgstr "田徑"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1809
+#: build/trans_presets.java:1964
 msgid "Edit Athletics"
 msgstr "編輯田徑"
 
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1969
 msgid "Archery"
 msgstr "射箭"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1815
+#: build/trans_presets.java:1970
 msgid "Edit Archery"
 msgstr "編輯射箭"
 
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1975
 msgid "Climbing"
 msgstr "攀岩"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1976
 msgid "Edit Climbing"
 msgstr "編輯攀岩"
 
-#: build/trans_presets.java:1826
+#: build/trans_presets.java:1981
 msgid "Canoeing"
 msgstr "獨木舟"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1827
+#: build/trans_presets.java:1982
 msgid "Edit Canoeing"
 msgstr "編輯獨木舟"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1833
+#: build/trans_presets.java:1988
 msgid "Edit Cycling"
 msgstr "編輯自行車"
 
-#: build/trans_presets.java:1838
+#: build/trans_presets.java:1993
 msgid "Dog Racing"
 msgstr "賽狗"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1839
+#: build/trans_presets.java:1994
 msgid "Edit Dog Racing"
 msgstr "編輯賽狗"
 
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1999
 msgid "Equestrian"
 msgstr "馬術"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:1845
+#: build/trans_presets.java:2000
 msgid "Edit Equestrian"
 msgstr "編輯馬術"
 
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:2005
 msgid "Horse Racing"
 msgstr "賽馬"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:1851
+#: build/trans_presets.java:2006
 msgid "Edit Horse Racing"
 msgstr "編輯賽馬"
 
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:2011
 msgid "Gymnastics"
 msgstr "體操"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:1857
+#: build/trans_presets.java:2012
 msgid "Edit Gymnastics"
 msgstr "編輯體操"
 
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:2017
 msgid "Motor Sports"
 msgstr "摩托車運動"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:1863
+#: build/trans_presets.java:2018
 msgid "Edit Motor Sports"
 msgstr "編輯摩托車運動"
 
-#: build/trans_presets.java:1868
+#: build/trans_presets.java:2023
 msgid "Skating"
 msgstr "溜冰"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:1869
+#: build/trans_presets.java:2024
 msgid "Edit Skating"
 msgstr "編輯溜冰"
 
-#: build/trans_presets.java:1874
+#: build/trans_presets.java:2029
 msgid "Skateboard"
 msgstr "滑板"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:1875
+#: build/trans_presets.java:2030
 msgid "Edit Skateboard"
 msgstr "編輯滑板"
 
-#: build/trans_presets.java:1880
+#: build/trans_presets.java:2035
 msgid "Swimming"
 msgstr "游泳"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:1881
+#: build/trans_presets.java:2036
 msgid "Edit Swimming"
 msgstr "編輯游泳"
@@ -22313,56 +23132,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:2043
 msgid "Edit Skiing"
 msgstr "編輯滑雪"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:1891
+#: build/trans_presets.java:2046
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "Difficulty"
 msgstr "困難度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "novice"
 msgstr "新手"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "easy"
 msgstr "容易"
 
-#: build/trans_presets.java:1892
-msgid "intermediate"
-msgstr "中級"
-
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "advanced"
 msgstr "進階"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "expert"
 msgstr "專家"
 
-#: build/trans_presets.java:1892
+#: build/trans_presets.java:2047
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:2050
 msgid "Shooting"
 msgstr "射擊"
@@ -22370,182 +23185,182 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:1897
+#: build/trans_presets.java:2052
 msgid "Edit Shooting"
 msgstr "編輯射擊"
 
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:2058
 msgid "Sport (Ball)"
 msgstr "運動（球類）"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:2059
 msgid "Soccer"
 msgstr "足球"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:1905
+#: build/trans_presets.java:2060
 msgid "Edit Soccer"
 msgstr "編輯足球"
 
-#: build/trans_presets.java:1910
+#: build/trans_presets.java:2065
 msgid "Football"
 msgstr "美式足球"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:1911
+#: build/trans_presets.java:2066
 msgid "Edit Football"
 msgstr "編輯美式足球"
 
-#: build/trans_presets.java:1916
+#: build/trans_presets.java:2071
 msgid "Australian Football"
 msgstr "澳洲足球"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:1917
+#: build/trans_presets.java:2072
 msgid "Edit Australian Football"
 msgstr "編輯澳洲足球"
 
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:2077
 msgid "Baseball"
 msgstr "棒球"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:1923
+#: build/trans_presets.java:2078
 msgid "Edit Baseball"
 msgstr "編輯棒球"
 
-#: build/trans_presets.java:1928
+#: build/trans_presets.java:2083
 msgid "Basketball"
 msgstr "籃球"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:1929
+#: build/trans_presets.java:2084
 msgid "Edit Basketball"
 msgstr "編輯籃球"
 
-#: build/trans_presets.java:1934
+#: build/trans_presets.java:2089
 msgid "Golf"
 msgstr "高爾夫"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:1935
+#: build/trans_presets.java:2090
 msgid "Edit Golf"
 msgstr "編輯高爾夫"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:1938
+#: build/trans_presets.java:2093
 msgid "golf_course"
 msgstr "高爾夫路線"
 
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:2095
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:1941
+#: build/trans_presets.java:2096
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:2101
 msgid "Bowls"
 msgstr "保齡球"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:1947
+#: build/trans_presets.java:2102
 msgid "Edit Bowls"
 msgstr "編輯保齡球"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:2107
 msgid "Cricket"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:2108
 msgid "Edit Cricket"
 msgstr ""
 
-#: build/trans_presets.java:1958
+#: build/trans_presets.java:2113
 msgid "Cricket Nets"
 msgstr ""
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:2114
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:1964
+#: build/trans_presets.java:2119
 msgid "Croquet"
 msgstr "木球"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:2120
 msgid "Edit Croquet"
 msgstr "編輯木球"
 
-#: build/trans_presets.java:1970
+#: build/trans_presets.java:2125
 msgid "Hockey"
 msgstr "曲棍球"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:2126
 msgid "Edit Hockey"
 msgstr "編曲棍球"
 
-#: build/trans_presets.java:1976
+#: build/trans_presets.java:2131
 msgid "Pelota"
 msgstr "回力球"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:2132
 msgid "Edit Pelota"
 msgstr "編輯回力球"
 
-#: build/trans_presets.java:1982
+#: build/trans_presets.java:2137
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:2138
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:1988
+#: build/trans_presets.java:2143
 msgid "Rugby"
 msgstr "橄欖球"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:2144
 msgid "Edit Rugby"
 msgstr "編輯橄欖球"
 
-#: build/trans_presets.java:1994
+#: build/trans_presets.java:2149
 msgid "Table Tennis"
 msgstr "桌球"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:2150
 msgid "Edit Table Tennis"
 msgstr "編輯桌球"
 
-#: build/trans_presets.java:2000
+#: build/trans_presets.java:2155
 msgid "Tennis"
 msgstr "網球"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:2156
 msgid "Edit Tennis"
 msgstr "編輯網路"
 
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2163
 msgid "Man-Made"
 msgstr "人造物"
 
 #. group "Man-Made"
-#: build/trans_presets.java:2009
+#: build/trans_presets.java:2164
 msgid "Buildings"
 msgstr "建築物"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2010
+#: build/trans_presets.java:2165
 msgid "Building"
 msgstr "建築物"
@@ -22553,5 +23368,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2168
 msgid "Public Building"
 msgstr "公共建築"
@@ -22559,10 +23374,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2015
+#: build/trans_presets.java:2170
 msgid "Edit Public Building"
 msgstr "編輯公共建築"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2174
 msgid "Town hall"
 msgstr "縣市政府/公所"
@@ -22570,10 +23385,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2021
+#: build/trans_presets.java:2176
 msgid "Edit Town hall"
 msgstr "編輯縣市政府/公所"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2180
 msgid "Embassy"
 msgstr "大使館"
@@ -22581,10 +23396,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2027
+#: build/trans_presets.java:2182
 msgid "Edit Embassy"
 msgstr "編輯大使館"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2186
 msgid "Courthouse"
 msgstr "法院"
@@ -22593,10 +23408,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:2034
+#: build/trans_presets.java:2189
 msgid "Edit Courthouse"
 msgstr "編輯法院"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2193
 msgid "Prison"
 msgstr "監獄"
@@ -22605,10 +23420,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:2041
+#: build/trans_presets.java:2196
 msgid "Edit Prison"
 msgstr "編輯監獄"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2200
 msgid "Police"
 msgstr "警察局"
@@ -22618,10 +23433,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:2049
+#: build/trans_presets.java:2204
 msgid "Edit Police"
 msgstr "編輯警察局"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2053
+#: build/trans_presets.java:2208
 msgid "Fire Station"
 msgstr "消防隊"
@@ -22630,10 +23445,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:2056
+#: build/trans_presets.java:2211
 msgid "Edit Fire Station"
 msgstr "編輯消防隊"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2215
 msgid "Post Office"
 msgstr "郵局"
@@ -22641,5 +23456,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2217
 msgid "Edit Post Office"
 msgstr "編輯郵局"
@@ -22647,15 +23462,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2223
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2069
+#: build/trans_presets.java:2224
 msgid "Edit Kindergarten"
 msgstr "編輯幼稚園"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2228
 msgid "School"
 msgstr "學校"
@@ -22663,10 +23478,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2075
+#: build/trans_presets.java:2230
 msgid "Edit School"
 msgstr "編輯學校"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2234
 msgid "University"
 msgstr "大學"
@@ -22674,10 +23489,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2081
+#: build/trans_presets.java:2236
 msgid "Edit University"
 msgstr "編輯大學"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2240
 msgid "College"
 msgstr "學院"
@@ -22685,5 +23500,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2087
+#: build/trans_presets.java:2242
 msgid "Edit College"
 msgstr "編輯學院"
@@ -22691,5 +23506,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2247
 msgid "Cinema"
 msgstr "電影院"
@@ -22698,10 +23513,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:2095
+#: build/trans_presets.java:2250
 msgid "Edit Cinema"
 msgstr "編輯電影院"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2099
+#: build/trans_presets.java:2254
 msgid "Library"
 msgstr "圖書館"
@@ -22710,9 +23525,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:2102
+#: build/trans_presets.java:2257
 msgid "Edit Library"
 msgstr "編輯圖書館"
 
-#: build/trans_presets.java:2107
+#: build/trans_presets.java:2262
 msgid "Arts Centre"
 msgstr "美術館"
@@ -22720,10 +23535,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2264
 msgid "Edit Arts Centre"
 msgstr "編輯美術館"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2113
+#: build/trans_presets.java:2268
 msgid "Theatre"
 msgstr "劇院"
@@ -22732,10 +23547,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:2116
+#: build/trans_presets.java:2271
 msgid "Edit Theatre"
 msgstr "編輯劇院"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2120
+#: build/trans_presets.java:2275
 msgid "Place of Worship"
 msgstr "宗教儀式場所"
@@ -22745,5 +23560,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:2124
+#: build/trans_presets.java:2279
 msgid "Edit Place of Worship"
 msgstr "編輯宗教儀式場所"
@@ -22752,6 +23567,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "Religion"
 msgstr "宗教"
@@ -22760,66 +23575,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "bahai"
 msgstr "巴海大同教"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "buddhist"
 msgstr "佛教"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "christian"
 msgstr "基督教系"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "hindu"
 msgstr "印度教"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jain"
 msgstr "耆那教"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "jewish"
 msgstr "猶太教"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "muslim"
 msgstr "回教"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "sikh"
 msgstr "錫克教"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2127 build/trans_presets.java:2939
-#: build/trans_presets.java:2948
+#: build/trans_presets.java:2282 build/trans_presets.java:3107
+#: build/trans_presets.java:3116
 msgid "zoroastrian"
 msgstr "祆教"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "Denomination"
 msgstr "教派"
@@ -22828,81 +23643,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "anglican"
 msgstr "英國國教"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "baptist"
 msgstr "浸信會"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "catholic"
 msgstr "天主教"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "evangelical"
 msgstr "福音派教會"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "lutheran"
 msgstr "路德教派"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "methodist"
 msgstr "衛理公會教"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "mormon"
 msgstr "摩門教"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "orthodox"
 msgstr "東正教"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "pentecostal"
 msgstr "聖靈降臨教派"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "presbyterian"
 msgstr "長老派教會"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "protestant"
 msgstr "新教"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "quaker"
 msgstr "教友派"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "shia"
 msgstr "什葉派"
 
-#: build/trans_presets.java:2128 build/trans_presets.java:2940
-#: build/trans_presets.java:2949
+#: build/trans_presets.java:2283 build/trans_presets.java:3108
+#: build/trans_presets.java:3117
 msgid "sunni"
 msgstr "遜尼派"
 
 #. <separator/>
-#: build/trans_presets.java:2132
+#: build/trans_presets.java:2287
 msgid "Addresses"
 msgstr "地址"
@@ -22911,5 +23726,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:2135
+#: build/trans_presets.java:2290
 msgid "Edit Address Information"
 msgstr "編輯地址資訊"
@@ -22917,5 +23732,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2137
+#: build/trans_presets.java:2292
 msgid "House number"
 msgstr ""
@@ -22923,25 +23738,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2294
 msgid "House name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2295
 msgid "Street name"
 msgstr "街道名稱"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2141
+#: build/trans_presets.java:2296
 msgid "City name"
 msgstr "城市名稱"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2142
+#: build/trans_presets.java:2297
 msgid "Post code"
 msgstr "郵遞區號"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2143
+#: build/trans_presets.java:2298
 msgid "Country code"
 msgstr "國碼"
@@ -22950,5 +23765,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:2149
+#: build/trans_presets.java:2304
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -22956,61 +23771,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "Numbering scheme"
 msgstr "編號規則"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "odd"
 msgstr "奇數"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "even"
 msgstr "偶數"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2306
 msgid "alphabetic"
 msgstr "按字母順序"
 
-#: build/trans_presets.java:2154
+#: build/trans_presets.java:2309
 msgid "Man Made"
 msgstr "人造物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2155
+#: build/trans_presets.java:2310
 msgid "Works"
 msgstr "作品"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2156
+#: build/trans_presets.java:2311
 msgid "Edit Works"
 msgstr "編輯作品"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2160
+#: build/trans_presets.java:2315
 msgid "Tower"
 msgstr "塔"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2161
+#: build/trans_presets.java:2316
 msgid "Edit Tower"
 msgstr "編輯塔"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "communication"
 msgstr "通訊"
 
-#: build/trans_presets.java:2164
+#: build/trans_presets.java:2319
 msgid "observation"
 msgstr "觀測"
 
 #. <optional>
-#: build/trans_presets.java:2166
+#: build/trans_presets.java:2321
 msgid "Height (meters)"
 msgstr "高度（米）"
@@ -23018,25 +23833,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2325
 msgid "Water Tower"
 msgstr "貯水塔"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2171
+#: build/trans_presets.java:2326
 msgid "Edit Water Tower"
 msgstr "編輯貯水塔"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2175
+#: build/trans_presets.java:2330
 msgid "Gasometer"
 msgstr "貯氣桶"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2331
 msgid "Edit Gasometer"
 msgstr "編輯貯氣桶"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2180
+#: build/trans_presets.java:2335
 msgid "Lighthouse"
 msgstr "燈塔"
@@ -23044,10 +23859,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2337
 msgid "Edit Lighthouse"
 msgstr "編輯燈塔"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2186
+#: build/trans_presets.java:2341
 msgid "Windmill"
 msgstr "風車"
@@ -23055,10 +23870,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2343
 msgid "Edit Windmill"
 msgstr "編輯風車"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2192
+#: build/trans_presets.java:2347
 msgid "Pipeline"
 msgstr "油管"
@@ -23067,37 +23882,37 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2350
 msgid "Edit Pipeline"
 msgstr "編輯油管"
 
-#: build/trans_presets.java:2198
-msgid "oil"
-msgstr ""
-
-#: build/trans_presets.java:2198 build/trans_presets.java:2240
+#: build/trans_presets.java:2353 build/trans_presets.java:2396
 msgid "gas"
 msgstr "天然氣"
 
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
+msgid "heat"
+msgstr ""
+
+#: build/trans_presets.java:2353
+msgid "oil"
+msgstr ""
+
+#: build/trans_presets.java:2353
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2198
-msgid "heat"
-msgstr ""
-
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2353
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2199
+#: build/trans_presets.java:2354
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2201
+#: build/trans_presets.java:2356
 msgid "Wastewater Plant"
 msgstr "汙水處理廠"
@@ -23107,10 +23922,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:2205
+#: build/trans_presets.java:2360
 msgid "Edit Wastewater Plant"
 msgstr "編輯汙水處理廠"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2209
+#: build/trans_presets.java:2364
 msgid "Crane"
 msgstr "起重機"
@@ -23118,21 +23933,16 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2211
+#: build/trans_presets.java:2366
 msgid "Edit Crane"
 msgstr "編輯起重機"
 
-#. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:2215
-msgid "Beacon"
-msgstr ""
-
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2372
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2221
+#: build/trans_presets.java:2376
 msgid "Survey Point"
 msgstr "測量點"
@@ -23140,10 +23950,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2223
+#: build/trans_presets.java:2378
 msgid "Edit Survey Point"
 msgstr "編輯測量點"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2227
+#: build/trans_presets.java:2382
 msgid "Surveillance"
 msgstr "監視"
@@ -23151,11 +23961,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2229
+#: build/trans_presets.java:2384
 msgid "Edit Surveillance Camera"
 msgstr "編輯監視攝影機"
 
-#. item "Man Made/Surveillance" text "Name"
+#. item "Man Made/Surveillance" combo "Type"
+#: build/trans_presets.java:2387
+msgid "indoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "outdoor"
+msgstr ""
+
+#: build/trans_presets.java:2387
+msgid "public"
+msgstr ""
+
 #. <separator/>
-#: build/trans_presets.java:2234
+#: build/trans_presets.java:2390
 msgid "Power Generator"
 msgstr "發電廠"
@@ -23165,35 +23987,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:2238
+#: build/trans_presets.java:2394
 msgid "Edit Power Generator"
 msgstr "編輯發電廠"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "wind"
 msgstr "風力"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "hydro"
 msgstr "水力"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "fossil"
 msgstr "燃油"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "nuclear"
 msgstr "核能"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "coal"
 msgstr "燃媒"
 
-#: build/trans_presets.java:2240
+#: build/trans_presets.java:2396
 msgid "photovoltaic"
 msgstr "光電"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2243
+#: build/trans_presets.java:2399
 msgid "Power Station"
 msgstr ""
@@ -23202,10 +24024,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:2246
+#: build/trans_presets.java:2402
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2408
 msgid "Power Sub Station"
 msgstr ""
@@ -23214,5 +24036,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:2255
+#: build/trans_presets.java:2411
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -23220,10 +24042,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2258 build/trans_presets.java:2275
+#: build/trans_presets.java:2414 build/trans_presets.java:2431
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2260
+#: build/trans_presets.java:2416
 msgid "Power Tower"
 msgstr "電塔"
@@ -23234,23 +24056,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:2265
+#: build/trans_presets.java:2421
 msgid "Edit Power Tower"
 msgstr "編輯電塔"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2422
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2267
+#: build/trans_presets.java:2423
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2269
+#: build/trans_presets.java:2425
 msgid "Power Line"
 msgstr "電線"
@@ -23259,79 +24081,74 @@
 #. <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:2272
+#: build/trans_presets.java:2428
 msgid "Edit Power Line"
 msgstr "編輯電線"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2429
 msgid "minor_line"
 msgstr ""
 
-#. item "Man Made/Power Line" text "Line reference"
-#: build/trans_presets.java:2276
-msgid "Voltage"
-msgstr "電壓"
-
-#. item "Man Made/Power Line" text "Voltage"
-#: build/trans_presets.java:2277
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2434
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 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:2278
+#: build/trans_presets.java:2435
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2278
+#: build/trans_presets.java:2435
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2438
 msgid "Amenities"
 msgstr "便利設施"
 
 #. group "Amenities"
-#: build/trans_presets.java:2282
+#: build/trans_presets.java:2439
 msgid "Toilets"
 msgstr "廁所"
 
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2446
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2290 build/trans_presets.java:2420
+#: build/trans_presets.java:2447 build/trans_presets.java:2588
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2449
 msgid "Post Box"
 msgstr "郵筒"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2454
 msgid "Telephone"
 msgstr "電話"
@@ -23340,5 +24157,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:2300
+#: build/trans_presets.java:2457
 msgid "Edit Telephone"
 msgstr "編輯電話"
@@ -23346,5 +24163,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2303 build/trans_presets.java:2421
+#: build/trans_presets.java:2460 build/trans_presets.java:2589
 msgid "Coins"
 msgstr "硬幣"
@@ -23352,5 +24169,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2304 build/trans_presets.java:2422
+#: build/trans_presets.java:2461 build/trans_presets.java:2590
 msgid "Notes"
 msgstr ""
@@ -23358,5 +24175,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2305 build/trans_presets.java:2423
+#: build/trans_presets.java:2462 build/trans_presets.java:2591
 msgid "Electronic purses and Charge cards"
 msgstr "電子錢包或收費卡"
@@ -23364,5 +24181,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2306 build/trans_presets.java:2424
+#: build/trans_presets.java:2463 build/trans_presets.java:2592
 msgid "Debit cards"
 msgstr ""
@@ -23370,15 +24187,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2307 build/trans_presets.java:2425
+#: build/trans_presets.java:2464 build/trans_presets.java:2593
 msgid "Credit cards"
 msgstr "信用卡"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2465
 msgid "Telephone cards"
 msgstr "電話卡"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2310
+#: build/trans_presets.java:2467
 msgid "Recycling"
 msgstr "資源回收"
@@ -23387,5 +24204,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:2313
+#: build/trans_presets.java:2470
 msgid "Edit Recycling station"
 msgstr "資源回收站"
@@ -23393,63 +24210,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2315
+#: build/trans_presets.java:2472
 msgid "Batteries"
 msgstr "電池"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2316
+#: build/trans_presets.java:2473
 msgid "Cans"
 msgstr "瓶罐"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2474
 msgid "Clothes"
 msgstr "衣服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2475
 msgid "Glass"
 msgstr "玻璃"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2319
+#: build/trans_presets.java:2476
 msgid "Paper"
 msgstr "紙張"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2320
+#: build/trans_presets.java:2477
 msgid "Scrap Metal"
 msgstr "廢金屬"
+
+#. item "Amenities/Recycling" check "Scrap Metal"
+#: build/trans_presets.java:2479
+msgid "Waste Basket"
+msgstr ""
+
+#. item "Amenities/Waste Basket"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
+#: build/trans_presets.java:2481
+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:2325
+#: build/trans_presets.java:2487
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "Material"
 msgstr "材質"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "stone"
 msgstr "石頭"
 
-#: build/trans_presets.java:2326
+#: build/trans_presets.java:2488
 msgid "plastic"
 msgstr "塑膠"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "Colour"
 msgstr "顏色"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "black"
 msgstr "黑色"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "brown"
 msgstr "淺褐色"
@@ -23528,5 +24356,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2327 build/trans_style.java:3157
+#: build/trans_presets.java:2489 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
@@ -23536,31 +24364,31 @@
 msgstr "綠色"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "red"
 msgstr "紅色"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "blue"
 msgstr "藍色"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "gray"
 msgstr "灰色"
 
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2489
 msgid "white"
 msgstr "白色"
 
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2490
 msgid "Amount of Seats"
 msgstr "座椅數量"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2330
+#: build/trans_presets.java:2492
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2331
+#: build/trans_presets.java:2493
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -23569,30 +24397,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2333 build/trans_presets.java:2809
+#: build/trans_presets.java:2495 build/trans_presets.java:2977
 msgid "Height"
 msgstr "高度"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "low"
 msgstr "低"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "half"
 msgstr "半高"
 
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2495
 msgid "full"
 msgstr "全高"
 
-#: build/trans_presets.java:2335
+#: build/trans_presets.java:2497
 msgid "Hide"
 msgstr "隱藏"
 
-#: build/trans_presets.java:2336
+#: build/trans_presets.java:2498
 msgid "Lock"
 msgstr "鎖"
 
-#: build/trans_presets.java:2338
+#: build/trans_presets.java:2500
 msgid "Fountain"
 msgstr "噴泉"
@@ -23601,10 +24429,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:2341
+#: build/trans_presets.java:2503
 msgid "Edit Fountain"
 msgstr "編輯噴泉"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2507
 msgid "Drinking Water"
 msgstr "飲水機"
@@ -23613,10 +24441,23 @@
 #. <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:2348
+#: build/trans_presets.java:2510
 msgid "Edit Drinking Water"
 msgstr "編輯飲水機"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2514
+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:2517
+msgid "Edit Fire Hydrant"
+msgstr ""
+
+#. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
+#. <key key="amenity" value="fire_hydrant" />
+#: build/trans_presets.java:2520
 msgid "Baby Hatch"
 msgstr ""
@@ -23624,15 +24465,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2354
+#: build/trans_presets.java:2522
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2360
+#: build/trans_presets.java:2528
 msgid "Shops"
 msgstr "商店"
 
 #. group "Shops"
-#: build/trans_presets.java:2361
+#: build/trans_presets.java:2529
 msgid "Car Dealer"
 msgstr ""
@@ -23640,10 +24481,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2363
+#: build/trans_presets.java:2531
 msgid "Edit Car Shop"
 msgstr "編輯汽車商店"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2536
 msgid "Bike Dealer"
 msgstr ""
@@ -23652,28 +24493,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:2371
+#: build/trans_presets.java:2539
 msgid "Edit Bicycle Shop"
 msgstr "編輯自行車商店"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2375
+#: build/trans_presets.java:2543
 msgid "Supermarket"
 msgstr "超級市場"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2376
+#: build/trans_presets.java:2544
 msgid "Edit Supermarket"
 msgstr "編輯超級市場"
 
-#: build/trans_presets.java:2381
+#: build/trans_presets.java:2549
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2382
+#: build/trans_presets.java:2550
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2387
+#: build/trans_presets.java:2555
 msgid "Convenience Store"
 msgstr "便利商店"
@@ -23681,9 +24522,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2557
 msgid "Edit Convenience Store"
 msgstr "編輯便利商店"
 
-#: build/trans_presets.java:2394
+#: build/trans_presets.java:2562
 msgid "Kiosk"
 msgstr ""
@@ -23691,27 +24532,27 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2564
 msgid "Edit Kiosk"
 msgstr ""
 
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2569
 msgid "Book Store"
 msgstr "書店"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2402
+#: build/trans_presets.java:2570
 msgid "Edit Book Store"
 msgstr "編輯書店"
 
-#: build/trans_presets.java:2407
+#: build/trans_presets.java:2575
 msgid "Travel Agency"
 msgstr "旅行社"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2408
+#: build/trans_presets.java:2576
 msgid "Edit Travel Agency"
 msgstr "編輯旅行社"
 
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2581
 msgid "Vending machine"
 msgstr "自動販賣機"
@@ -23719,5 +24560,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2415
+#: build/trans_presets.java:2583
 msgid "Edit Vending machine"
 msgstr "編輯自動販賣機"
@@ -23725,88 +24566,88 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "Vending products"
 msgstr "販賣產品"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "food"
 msgstr "食物"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "sweets"
 msgstr "甜點"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "cigarettes"
 msgstr "菸"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "photos"
 msgstr "相片"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "animal_food"
 msgstr "飼料"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "news_papers"
 msgstr "報紙"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "toys"
 msgstr "玩具"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "stamps"
 msgstr "郵票"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "SIM-cards"
 msgstr "SIM-卡"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "condoms"
 msgstr "保險套"
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2417
+#: build/trans_presets.java:2585
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2426
+#: build/trans_presets.java:2594
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2428
+#: build/trans_presets.java:2596
 msgid "Butcher"
 msgstr "肉類"
@@ -23814,9 +24655,9 @@
 #. item "Shops/Butcher"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2598
 msgid "Edit Butcher"
 msgstr "編輯肉店"
 
-#: build/trans_presets.java:2435
+#: build/trans_presets.java:2603
 msgid "Baker"
 msgstr "麵包類"
@@ -23824,9 +24665,9 @@
 #. item "Shops/Baker"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2605
 msgid "Edit Baker"
 msgstr "編輯麵包店"
 
-#: build/trans_presets.java:2442
+#: build/trans_presets.java:2610
 msgid "Florist"
 msgstr "花類"
@@ -23834,18 +24675,18 @@
 #. item "Shops/Florist"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2444
+#: build/trans_presets.java:2612
 msgid "Edit Florist"
 msgstr "編輯花店"
 
-#: build/trans_presets.java:2449
+#: build/trans_presets.java:2617
 msgid "Organic"
 msgstr "有機產品"
 
 #. item "Shops/Organic"
-#: build/trans_presets.java:2450
+#: build/trans_presets.java:2618
 msgid "Edit Organic Shop"
 msgstr "編輯有機產品商店"
 
-#: build/trans_presets.java:2455
+#: build/trans_presets.java:2623
 msgid "Alcohol"
 msgstr "酒類"
@@ -23853,54 +24694,54 @@
 #. item "Shops/Alcohol"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2457
+#: build/trans_presets.java:2625
 msgid "Edit Alcohol Shop"
 msgstr "編輯賣酒的商店"
 
-#: build/trans_presets.java:2462
+#: build/trans_presets.java:2630
 msgid "Beverages"
 msgstr "飲料類"
 
 #. item "Shops/Beverages"
-#: build/trans_presets.java:2463
+#: build/trans_presets.java:2631
 msgid "Edit Beverages Shop"
 msgstr "編輯飲料店"
 
-#: build/trans_presets.java:2468
+#: build/trans_presets.java:2636
 msgid "Computer"
 msgstr "電腦類"
 
 #. item "Shops/Computer"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2637
 msgid "Edit Computer Shop"
 msgstr "編輯電腦商店"
 
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2642
 msgid "Electronics"
 msgstr "電子材料"
 
 #. item "Shops/Electronics"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2643
 msgid "Edit Electronics Shop"
 msgstr "編輯電子材料行"
 
-#: build/trans_presets.java:2480
+#: build/trans_presets.java:2648
 msgid "Hifi"
 msgstr "Hifi"
 
 #. item "Shops/Hifi"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2649
 msgid "Edit Hifi Shop"
 msgstr "編輯 Hifi 音響店"
 
-#: build/trans_presets.java:2486
+#: build/trans_presets.java:2654
 msgid "Furniture"
 msgstr "傢俱類"
 
 #. item "Shops/Furniture"
-#: build/trans_presets.java:2487
+#: build/trans_presets.java:2655
 msgid "Edit Furniture Shop"
 msgstr "編輯傢俱店"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2660
 msgid "Garden Centre"
 msgstr "園藝中心"
@@ -23908,9 +24749,9 @@
 #. item "Shops/Garden Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2662
 msgid "Edit Garden Centre"
 msgstr "編輯園藝中心"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2667
 msgid "Hardware"
 msgstr ""
@@ -23918,9 +24759,9 @@
 #. item "Shops/Hardware"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2501
+#: build/trans_presets.java:2669
 msgid "Edit Hardware Store"
 msgstr ""
 
-#: build/trans_presets.java:2506
+#: build/trans_presets.java:2674
 msgid "Do-it-yourself-store"
 msgstr "DIY 商店"
@@ -23928,54 +24769,54 @@
 #. item "Shops/Do-it-yourself-store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2508
+#: build/trans_presets.java:2676
 msgid "Edit Do-it-yourself-store"
 msgstr "編輯 DIY 商店"
 
-#: build/trans_presets.java:2513
+#: build/trans_presets.java:2681
 msgid "Stationery"
 msgstr "文具類"
 
 #. item "Shops/Stationery"
-#: build/trans_presets.java:2514
+#: build/trans_presets.java:2682
 msgid "Edit Stationery Shop"
 msgstr "編輯文具店"
 
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2687
 msgid "Hairdresser"
 msgstr "美髮類"
 
 #. item "Shops/Hairdresser"
-#: build/trans_presets.java:2520
+#: build/trans_presets.java:2688
 msgid "Edit Hairdresser"
 msgstr "編輯美髮店"
 
-#: build/trans_presets.java:2525
+#: build/trans_presets.java:2693
 msgid "Shoes"
 msgstr "鞋類"
 
 #. item "Shops/Shoes"
-#: build/trans_presets.java:2526
+#: build/trans_presets.java:2694
 msgid "Edit Shoe Shop"
 msgstr "編輯鞋店"
 
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2699
 msgid "Toys"
 msgstr "玩具類"
 
 #. item "Shops/Toys"
-#: build/trans_presets.java:2532
+#: build/trans_presets.java:2700
 msgid "Edit Toy Shop"
 msgstr "編輯玩具店"
 
-#: build/trans_presets.java:2537
+#: build/trans_presets.java:2705
 msgid "Video"
 msgstr "影片類"
 
 #. item "Shops/Video"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2706
 msgid "Edit Video Shop"
 msgstr "編輯影片類商店"
 
-#: build/trans_presets.java:2543
+#: build/trans_presets.java:2711
 msgid "Dry Cleaning"
 msgstr "乾洗類"
@@ -23983,9 +24824,9 @@
 #. item "Shops/Dry Cleaning"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2713
 msgid "Edit Dry Cleaning"
 msgstr "編輯乾洗店"
 
-#: build/trans_presets.java:2550
+#: build/trans_presets.java:2718
 msgid "Laundry"
 msgstr "洗衣店"
@@ -23993,9 +24834,9 @@
 #. item "Shops/Laundry"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2720
 msgid "Edit Laundry"
 msgstr "編輯洗衣店"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2725
 msgid "Outdoor"
 msgstr "戶外用品"
@@ -24003,28 +24844,28 @@
 #. item "Shops/Outdoor"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2727
 msgid "Edit Outdoor Shop"
 msgstr "編輯戶外用品店"
 
 #. item "Shops/Sports"
-#: build/trans_presets.java:2565
+#: build/trans_presets.java:2733
 msgid "Edit Sports Shop"
 msgstr "編輯運動用品店"
 
-#: build/trans_presets.java:2570
+#: build/trans_presets.java:2738
 msgid "Optician"
 msgstr "眼鏡類"
 
 #. item "Shops/Optician"
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2739
 msgid "Edit Optician"
 msgstr "編輯眼鏡行"
 
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2746
 msgid "Cash"
 msgstr "現金"
 
 #. group "Cash"
-#: build/trans_presets.java:2579
+#: build/trans_presets.java:2747
 msgid "Bank"
 msgstr "銀行"
@@ -24032,14 +24873,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2581
+#: build/trans_presets.java:2749
 msgid "Edit Bank"
 msgstr "編輯銀行"
 
-#: build/trans_presets.java:2586 build/trans_presets.java:2595
+#: build/trans_presets.java:2754 build/trans_presets.java:2763
 msgid "Automated Teller Machine"
 msgstr "自動提款機(ATM)"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2588
+#: build/trans_presets.java:2756
 msgid "Money Exchange"
 msgstr ""
@@ -24047,5 +24888,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2590
+#: build/trans_presets.java:2758
 msgid "Edit Money Exchange"
 msgstr ""
@@ -24053,15 +24894,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2597
+#: build/trans_presets.java:2765
 msgid "Edit Automated Teller Machine"
 msgstr "編輯自動提款機"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2602
+#: build/trans_presets.java:2770
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2603
+#: build/trans_presets.java:2771
 msgid "Doctors"
 msgstr "醫師"
@@ -24069,18 +24910,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2605
+#: build/trans_presets.java:2773
 msgid "Edit Doctors"
 msgstr "編輯醫師"
 
-#: build/trans_presets.java:2610
+#: build/trans_presets.java:2778
 msgid "Dentist"
 msgstr "牙醫"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2611
+#: build/trans_presets.java:2779
 msgid "Edit Dentist"
 msgstr "編輯牙醫"
 
-#: build/trans_presets.java:2616
+#: build/trans_presets.java:2784
 msgid "Pharmacy"
 msgstr "藥局"
@@ -24088,5 +24929,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2618
+#: build/trans_presets.java:2786
 msgid "Edit Pharmacy"
 msgstr "編輯藥局"
@@ -24094,9 +24935,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2620
+#: build/trans_presets.java:2788
 msgid "Dispensing"
 msgstr "配藥"
 
-#: build/trans_presets.java:2624
+#: build/trans_presets.java:2792
 msgid "Hospital"
 msgstr "醫院"
@@ -24104,10 +24945,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2626
+#: build/trans_presets.java:2794
 msgid "Edit Hospital"
 msgstr "編輯醫院"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2630
+#: build/trans_presets.java:2798
 msgid "Emergency Access Point"
 msgstr ""
@@ -24116,5 +24957,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:2633
+#: build/trans_presets.java:2801
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -24123,20 +24964,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2636
+#: build/trans_presets.java:2804
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2637
+#: build/trans_presets.java:2805
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2639
+#: build/trans_presets.java:2807
 msgid "Phone Number"
 msgstr "電話號碼"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2640
+#: build/trans_presets.java:2808
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(使用國際碼，像是 +12-345-67890)"
@@ -24144,5 +24985,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2643
+#: build/trans_presets.java:2811
 msgid "Veterinary"
 msgstr "獸醫"
@@ -24151,64 +24992,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:2646
+#: build/trans_presets.java:2814
 msgid "Edit Veterinary"
 msgstr "編輯獸醫"
 
-#: build/trans_presets.java:2653
+#: build/trans_presets.java:2821
 msgid "Geography"
 msgstr "地理學"
 
 #. group "Geography"
-#: build/trans_presets.java:2654
+#: build/trans_presets.java:2822
 msgid "Places"
 msgstr "地名"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2655
+#: build/trans_presets.java:2823
 msgid "Continent"
 msgstr ""
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2656
+#: build/trans_presets.java:2824
 msgid "Edit Continent"
 msgstr ""
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2661
+#: build/trans_presets.java:2829
 msgid "Country"
 msgstr ""
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2662
+#: build/trans_presets.java:2830
 msgid "Edit Country"
 msgstr ""
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2667
+#: build/trans_presets.java:2835
 msgid "State"
 msgstr ""
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2668
+#: build/trans_presets.java:2836
 msgid "Edit State"
 msgstr ""
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2673
+#: build/trans_presets.java:2841
 msgid "Region"
 msgstr ""
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2674
+#: build/trans_presets.java:2842
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2679
+#: build/trans_presets.java:2847
 msgid "County"
 msgstr "縣"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2680
+#: build/trans_presets.java:2848
 msgid "Edit County"
 msgstr "編輯縣"
@@ -24216,15 +25057,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2686
+#: build/trans_presets.java:2854
 msgid "City"
 msgstr "市"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2687
+#: build/trans_presets.java:2855
 msgid "Edit City"
 msgstr "編輯市"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2692
+#: build/trans_presets.java:2860
 msgid "Town"
 msgstr "鄉/鎮"
@@ -24232,10 +25073,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2694
+#: build/trans_presets.java:2862
 msgid "Edit Town"
 msgstr "編輯鄉/鎮"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2699
+#: build/trans_presets.java:2867
 msgid "Suburb"
 msgstr "郊區"
@@ -24243,25 +25084,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2701
+#: build/trans_presets.java:2869
 msgid "Edit Suburb"
 msgstr "編輯郊區"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2706
+#: build/trans_presets.java:2874
 msgid "Village"
 msgstr "村/里"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2707
+#: build/trans_presets.java:2875
 msgid "Edit Village"
 msgstr "編輯村/里"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2712
+#: build/trans_presets.java:2880
 msgid "Hamlet"
 msgstr ""
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2713
+#: build/trans_presets.java:2881
 msgid "Edit Hamlet"
 msgstr ""
@@ -24269,5 +25110,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2719
+#: build/trans_presets.java:2887
 msgid "Locality"
 msgstr ""
@@ -24275,10 +25116,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2721
+#: build/trans_presets.java:2889
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2726
+#: build/trans_presets.java:2894
 msgid "Island"
 msgstr "島嶼"
@@ -24286,10 +25127,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2728
+#: build/trans_presets.java:2896
 msgid "Edit Island"
 msgstr "編輯島嶼"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2733
+#: build/trans_presets.java:2901
 msgid "Islet"
 msgstr ""
@@ -24297,5 +25138,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2735
+#: build/trans_presets.java:2903
 msgid "Edit Islet"
 msgstr ""
@@ -24303,5 +25144,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2741
+#: build/trans_presets.java:2909
 msgid "Cave Entrance"
 msgstr "洞窟入口"
@@ -24309,10 +25150,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2743
+#: build/trans_presets.java:2911
 msgid "Edit Cave Entrance"
 msgstr "編輯洞窟入口"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2747
+#: build/trans_presets.java:2915
 msgid "Peak"
 msgstr "峰"
@@ -24320,10 +25161,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2917
 msgid "Edit Peak"
 msgstr "編輯山峰"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2754
+#: build/trans_presets.java:2922
 msgid "Glacier"
 msgstr "冰河"
@@ -24331,10 +25172,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2756
+#: build/trans_presets.java:2924
 msgid "Edit Glacier"
 msgstr "編輯冰河"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2761
+#: build/trans_presets.java:2929
 msgid "Volcano"
 msgstr "火山"
@@ -24342,70 +25183,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2763
+#: build/trans_presets.java:2931
 msgid "Edit Volcano"
 msgstr "編輯火山"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2769
+#: build/trans_presets.java:2937
 msgid "Boundaries"
 msgstr "邊界"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2770
+#: build/trans_presets.java:2938
 msgid "National"
 msgstr "國界"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2771
+#: build/trans_presets.java:2939
 msgid "Edit National Boundary"
 msgstr "編輯國界"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2776
+#: build/trans_presets.java:2944
 msgid "Administrative"
 msgstr "行政區"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2777
+#: build/trans_presets.java:2945
 msgid "Edit Administrative Boundary"
 msgstr "編輯行政區邊界"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2782
+#: build/trans_presets.java:2950
 msgid "Civil"
 msgstr "城市的"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2783
+#: build/trans_presets.java:2951
 msgid "Edit Civil Boundary"
 msgstr "編輯城市邊界"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2956
 msgid "Political"
 msgstr "政治的"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2789
+#: build/trans_presets.java:2957
 msgid "Edit Political Boundary"
 msgstr "編輯政治的邊界"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2962
 msgid "National park"
 msgstr "國家公園"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2795
+#: build/trans_presets.java:2963
 msgid "Edit National Park Boundary"
 msgstr "編輯國家公園"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2801
+#: build/trans_presets.java:2969
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2802
+#: build/trans_presets.java:2970
 msgid "Tree"
 msgstr "樹"
@@ -24414,15 +25255,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:2805
+#: build/trans_presets.java:2973
 msgid "Edit Tree"
 msgstr "編輯樹"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2978
 msgid "Botanical Name"
 msgstr "植物學名"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2812
+#: build/trans_presets.java:2980
 msgid "Wood"
 msgstr ""
@@ -24431,5 +25272,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:2815
+#: build/trans_presets.java:2983
 msgid "Edit Wood"
 msgstr ""
@@ -24437,17 +25278,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "coniferous"
 msgstr "松類"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "deciduous"
 msgstr "落葉類"
 
-#: build/trans_presets.java:2818 build/trans_presets.java:2827
+#: build/trans_presets.java:2986 build/trans_presets.java:2995
 msgid "mixed"
 msgstr "混合"
 
-#: build/trans_presets.java:2820
+#: build/trans_presets.java:2988
 msgid "Forest"
 msgstr "森林"
@@ -24456,14 +25297,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:2823
+#: build/trans_presets.java:2991
 msgid "Edit Forest Landuse"
 msgstr "編輯森林土地利用"
 
-#: build/trans_presets.java:2829
+#: build/trans_presets.java:2997
 msgid "Nature Reserve"
 msgstr "自然保育"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:2830
+#: build/trans_presets.java:2998
 msgid "Edit Nature Reserve"
 msgstr "編輯自然保育"
@@ -24471,25 +25312,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2835
+#: build/trans_presets.java:3003
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:2836
+#: build/trans_presets.java:3004
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:2840
+#: build/trans_presets.java:3008
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:2841
+#: build/trans_presets.java:3009
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:2845
+#: build/trans_presets.java:3013
 msgid "Fell"
 msgstr ""
@@ -24497,10 +25338,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:2847
+#: build/trans_presets.java:3015
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:2851
+#: build/trans_presets.java:3019
 msgid "Heath"
 msgstr ""
@@ -24508,5 +25349,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:2853
+#: build/trans_presets.java:3021
 msgid "Edit Heath"
 msgstr ""
@@ -24514,5 +25355,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2858
+#: build/trans_presets.java:3026
 msgid "Farmyard"
 msgstr ""
@@ -24521,45 +25362,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:2861
+#: build/trans_presets.java:3029
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:2866
+#: build/trans_presets.java:3034
 msgid "Farmland"
 msgstr ""
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:2867
+#: build/trans_presets.java:3035
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:2872
+#: build/trans_presets.java:3040
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:2873
+#: build/trans_presets.java:3041
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:2878
+#: build/trans_presets.java:3046
 msgid "Vineyard"
 msgstr ""
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:2879
+#: build/trans_presets.java:3047
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:2884
+#: build/trans_presets.java:3052
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:2885
+#: build/trans_presets.java:3053
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -24567,25 +25408,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:3059
 msgid "Garden"
 msgstr "花園"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:2892
+#: build/trans_presets.java:3060
 msgid "Edit Garden"
 msgstr "編輯花園"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:3064
 msgid "Grass"
 msgstr "草地"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:2897
+#: build/trans_presets.java:3065
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:2902
+#: build/trans_presets.java:3070
 msgid "Village Green"
 msgstr ""
@@ -24593,10 +25434,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:2904
+#: build/trans_presets.java:3072
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:2909
+#: build/trans_presets.java:3077
 msgid "Common"
 msgstr ""
@@ -24604,20 +25445,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:3079
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:2915
+#: build/trans_presets.java:3083
 msgid "Park"
 msgstr "公園"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:2916
+#: build/trans_presets.java:3084
 msgid "Edit Park"
 msgstr "編輯公園"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:2920
+#: build/trans_presets.java:3088
 msgid "Recreation Ground"
 msgstr ""
@@ -24625,5 +25466,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:2922
+#: build/trans_presets.java:3090
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -24631,15 +25472,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2928
+#: build/trans_presets.java:3096
 msgid "Residential area"
 msgstr ""
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:2929
+#: build/trans_presets.java:3097
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:2934
+#: build/trans_presets.java:3102
 msgid "Graveyard"
 msgstr ""
@@ -24647,9 +25488,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:2936
+#: build/trans_presets.java:3104
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:2942
+#: build/trans_presets.java:3110
 msgid "Cemetery"
 msgstr ""
@@ -24657,39 +25498,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:2944
+#: build/trans_presets.java:3112
 msgid "Edit Cemetery Landuse"
 msgstr ""
 
-#: build/trans_presets.java:2951
+#: build/trans_presets.java:3119
 msgid "Retail"
 msgstr ""
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:3120
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:2957
+#: build/trans_presets.java:3125
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:3126
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:2963
+#: build/trans_presets.java:3131
 msgid "Industrial"
 msgstr "工業區"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:3132
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:2969
+#: build/trans_presets.java:3137
 msgid "Railway land"
 msgstr ""
@@ -24697,15 +25538,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:3139
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:2976
+#: build/trans_presets.java:3144
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:2977
+#: build/trans_presets.java:3145
 msgid "Edit Military Landuse"
 msgstr ""
@@ -24713,50 +25554,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2983
+#: build/trans_presets.java:3151
 msgid "Construction area"
 msgstr ""
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:2984
+#: build/trans_presets.java:3152
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:2989
+#: build/trans_presets.java:3157
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:3158
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:2995
+#: build/trans_presets.java:3163
 msgid "Greenfield"
 msgstr ""
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:2996
+#: build/trans_presets.java:3164
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3001
+#: build/trans_presets.java:3169
 msgid "Landfill"
 msgstr ""
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3002
+#: build/trans_presets.java:3170
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3007
+#: build/trans_presets.java:3175
 msgid "Quarry"
 msgstr ""
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3008
+#: build/trans_presets.java:3176
 msgid "Edit Quarry Landuse"
 msgstr ""
@@ -24766,5 +25607,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:3021
+#: build/trans_presets.java:3189
 msgid "Edit Multipolygon"
 msgstr ""
@@ -24773,10 +25614,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3027
+#: build/trans_presets.java:3195
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3196
 msgid "inner segment"
 msgstr ""
@@ -24784,5 +25625,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3199
 msgid "Turn restriction"
 msgstr ""
@@ -24791,5 +25632,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3034
+#: build/trans_presets.java:3202
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -24797,34 +25638,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3204
 msgid "only_straight_on"
 msgstr ""
@@ -24833,15 +25674,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3041
+#: build/trans_presets.java:3209
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3210
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3211
 msgid "to way"
 msgstr ""
@@ -24849,5 +25690,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3046
+#: build/trans_presets.java:3214
 msgid "Route"
 msgstr ""
@@ -24856,5 +25697,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3217
 msgid "Edit Route"
 msgstr ""
@@ -24862,5 +25703,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "Route type"
 msgstr ""
@@ -24951,5 +25792,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3051 build/trans_style.java:233
+#: build/trans_presets.java:3219 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -24959,17 +25800,17 @@
 msgstr "單車"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "bus"
 msgstr "公車"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "road"
 msgstr "道路"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ferry"
 msgstr "渡輪"
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "ski"
 msgstr ""
@@ -25029,5 +25870,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3051 build/trans_style.java:247
+#: build/trans_presets.java:3219 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -25036,9 +25877,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3051
+#: build/trans_presets.java:3219
 msgid "detour"
 msgstr ""
@@ -25052,10 +25893,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3051 build/trans_style.java:1208
+#: build/trans_presets.java:3219 build/trans_style.java:1208
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3222
 msgid "Symbol description"
 msgstr ""
@@ -25063,31 +25904,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3057
+#: build/trans_presets.java:3225
 msgid "Network"
 msgstr "網路"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3059
+#: build/trans_presets.java:3227
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3060
+#: build/trans_presets.java:3228
 msgid "Color (hex)"
 msgstr ""
@@ -25096,106 +25937,31 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3063
+#: build/trans_presets.java:3231
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3064
+#: build/trans_presets.java:3232
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3065
+#: build/trans_presets.java:3233
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3234
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3235
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3068
+#: build/trans_presets.java:3236
 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 ""
 
@@ -25731,77 +26497,4 @@
 #: build/trans_style.java:975 build/trans_style.java:983
 msgid "highway_track"
-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_style.java:756 build/trans_style.java:1182
-#: build/trans_style.java:1246 build/trans_style.java:1254
-#: build/trans_style.java:1263 build/trans_style.java:1271
-#: build/trans_style.java:1279 build/trans_style.java:1280
-#: build/trans_style.java:1287
-msgid "rail"
 msgstr ""
 
@@ -26190,7 +26883,6 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #: build/trans_style.java:1101
-#, fuzzy
 msgid "rapids"
-msgstr "浸信會"
+msgstr ""
 
 #. color manmade
@@ -29329,158 +30021,4 @@
 msgstr ""
 
-#~ msgid "Bridleway"
-#~ msgstr "馬道"
-
-#~ msgid "Cycleway"
-#~ msgstr "自行車道"
-
-#~ msgid "Footway"
-#~ msgstr "人行步道"
-
-#~ msgid "Track Grade 1"
-#~ msgstr "產業道路等級 1"
-
-#~ msgid "Edit Track of grade 1"
-#~ msgstr "編輯產業道路等級 1"
-
-#~ msgid "Track Grade 2"
-#~ msgstr "產業道路等級 2"
-
-#~ msgid "Edit Track of grade 2"
-#~ msgstr "編輯產業道路等級 2"
-
-#~ msgid "Track Grade 3"
-#~ msgstr "產業道路等級 3"
-
-#~ msgid "Edit Track of grade 3"
-#~ msgstr "編輯產業道路等級 3"
-
-#~ msgid "Track Grade 4"
-#~ msgstr "產業道路等級 4"
-
-#~ msgid "Edit Track of grade 4"
-#~ msgstr "編輯產業道路等級 4"
-
-#~ msgid "Track Grade 5"
-#~ msgstr "產業道路等級 5"
-
-#~ msgid "Edit Track of grade 5"
-#~ msgstr "編輯產業道路等級 5"
-
-#~ msgid "Edit Hiking"
-#~ msgstr "編輯健走"
-
-#~ msgid "Edit Mountain Hiking"
-#~ msgstr "編輯登山健行"
-
-#~ msgid "Edit Demanding Mountain Hiking"
-#~ msgstr "編輯較難的登山健行"
-
-#~ msgid "Edit Alpine Hiking"
-#~ msgstr "編輯高山健行"
-
-#~ msgid "Edit Demanding Alpine Hiking"
-#~ msgstr "編輯較難的高山健行"
-
-#~ msgid "Edit Difficult Alpine Hiking"
-#~ msgstr "編輯艱難的高山健行"
-
-#~ msgid "Id > 0 required, got {0}"
-#~ msgstr "需要 Id > 0，卻收到 {0}"
-
-#~ msgid "Parameter ''{0}'' must not be null"
-#~ msgstr "參數「{0}」不能為 null"
-
-#~ msgid "Parameter ''{0}'' must not be null."
-#~ msgstr "參數「{0}」必須不為空值(null)"
-
-#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
-#~ msgstr "預期為 OsmDataLayer 或 GpxLayer 的實體。卻取得「{0}」。"
-
-#~ msgid ""
-#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
-#~ "This can lead to nodes being deleted accidentally.\n"
-#~ "Are you really sure to continue?"
-#~ msgstr ""
-#~ "選取的路徑有在已下載資料區域之外的節點。\n"
-#~ "這樣可能會造成意外刪除某些節點。\n"
-#~ "確定要繼續嗎？"
-
-#~ msgid ""
-#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
-#~ msgstr "不能復原「{0}」指令，因為圖層「{1}」已不存在"
-
-#~ msgid "Parameter ''{0}'' must not be empty"
-#~ msgstr "參數「{0}」不能空白"
-
-#~ msgid "Expected array of length 4, got {0}"
-#~ msgstr "預期的陣列長度為 4，卻收到 {0}"
-
-#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
-#~ msgstr "預期參數「{0}」> 0.0，卻收到 {1}"
-
-#~ msgid "Expected ID >= 0. Got {0}."
-#~ msgstr "預期 ID >= 0。收到 {0}。"
-
-#~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
-#~ msgstr "預期參數 ''{0}'' >= 0，卻收到 {1}"
-
-#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
-#~ msgstr "參數「{0}」不是可接受的類別，取得「{1}」"
-
-#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
-#~ msgstr "預期參數「{0}」> 0，卻收到 {1}"
-
-#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
-#~ msgstr "參數「{0}」應使用範圍 0..{1}，卻收到 {2}"
-
-#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
-#~ msgstr "參數「{0}」應為 > 0，得到「{1}」"
-
-#~ msgid "Parameter current out of range. Got {0}."
-#~ msgstr "參數目前超出範圍：得到 {0}"
-
-#~ msgid "Unexpected column index. Got {0}."
-#~ msgstr "未預期的欄位索引。得到 {0}"
-
-#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
-#~ msgstr "參數「col」必須為 0 或 1。卻得到 {0}"
-
-#~ msgid ">"
-#~ msgstr ">"
-
-#~ msgid "Parameter ''{0}'' must not be empty."
-#~ msgstr "參數「{0}」不能為空白。"
-
-#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
-#~ msgstr "標籤的參數「{0}」只能有一個鍵值。卻收到 {1}。"
-
-#~ msgid "Dialog not created yet. Invoke createInstance() first"
-#~ msgstr "對話盒尚未建立。先呼叫 createInstance()"
-
-#~ msgid "Conflicts in data"
-#~ msgstr "衝突發生於資料"
-
-#~ msgid ""
-#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
-#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
-#~ "the new role?</html>"
-#~ msgstr ""
-#~ "<html>您正在 {0} 原型上設定空角色。<br>這個動作等於要刪除這些原型的角色。"
-#~ "<br>您確定要套用此新角色嗎？</html>"
-
-#~ msgid "Value of child.getId() > 0 expected. Got {1}."
-#~ msgstr "預期的數值為 child.getId() > 0。卻得到 {1}。"
-
-#~ msgid "image"
-#~ msgid_plural "images"
-#~ msgstr[0] "圖片"
-
-#~ msgid "Plugin {0} requires JOSM update to version {1}."
-#~ msgstr "外掛程式 {0} 要求 JOSM 更新到 {1} 版。"
-
-#~ msgid "<html>"
-#~ msgstr "<html>"
-
 #~ msgid "Open in Browser"
 #~ msgstr "在瀏覽器中打開"
@@ -29543,7 +30081,4 @@
 #~ msgid "Only one node selected"
 #~ msgstr "只選取一個節點"
-
-#~ msgid "Please select ways with almost right angles to orthogonalize."
-#~ msgstr "請選擇有近乎正確角度的路徑來做直角化。"
 
 #~ msgid "No document open so nothing to save."
@@ -29668,4 +30203,7 @@
 #~ msgstr "找不到檔案"
 
+#~ msgid ">"
+#~ msgstr ">"
+
 #~ msgid "Merging conflicts."
 #~ msgstr "正在合併衝突。"
@@ -29704,4 +30242,8 @@
 #~ msgstr "找不到具可讀時刻戳記的圖片。"
 
+#~ msgid "image"
+#~ msgid_plural "images"
+#~ msgstr[0] "圖片"
+
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "檔案「{0}」的日期無法解析。"
@@ -29722,7 +30264,4 @@
 #~ msgstr "登入"
 
-#~ msgid "Public"
-#~ msgstr "公開"
-
 #~ msgid "There is no EXIF time within the file \"{0}\"."
 #~ msgstr "在檔案「{0}」中沒有 EXIF 時刻。"
@@ -29814,7 +30353,4 @@
 #~ msgid "timezone difference: "
 #~ msgstr "時區差異： "
-
-#~ msgid "Time entered could not be parsed."
-#~ msgstr "輸入的時刻無法解析。"
 
 #~ msgid "{0} within the track."
@@ -29967,4 +30503,7 @@
 #~ msgstr "找不到外掛程式：{0}。"
 
+#~ msgid "Plugin {0} requires JOSM update to version {1}."
+#~ msgstr "外掛程式 {0} 要求 JOSM 更新到 {1} 版。"
+
 #~ msgid ""
 #~ "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -30037,7 +30576,4 @@
 #~ msgstr "將 TCX 檔案匯入為 GPS 軌跡"
 
-#~ msgid "Interpolation"
-#~ msgstr "插入補間"
-
 #~ msgid "Replaces Selection with Users data"
 #~ msgstr "以使用者資料取代選擇區域"
@@ -30051,4 +30587,13 @@
 #~ msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
 #~ msgstr "這 是 實 驗 性 的。請儲存您的工作並在上傳前檢驗。"
+
+#~ msgid ""
+#~ "The selected way(s) have nodes outside of the downloaded data region.\n"
+#~ "This can lead to nodes being deleted accidentally.\n"
+#~ "Are you really sure to continue?"
+#~ msgstr ""
+#~ "選取的路徑有在已下載資料區域之外的節點。\n"
+#~ "這樣可能會造成意外刪除某些節點。\n"
+#~ "確定要繼續嗎？"
 
 #~ msgid "Validate either current selection or complete dataset."
@@ -30210,4 +30755,64 @@
 #~ "許多能讓您的生活更輕鬆的公用程式：例如簡化路徑、連結區域、跳至位置。"
 
+#~ msgid "Boat"
+#~ msgstr "小船"
+
+#~ msgid "Motorboat"
+#~ msgstr "動力小船"
+
+#~ msgid "Bridleway"
+#~ msgstr "馬道"
+
+#~ msgid "Cycleway"
+#~ msgstr "自行車道"
+
+#~ msgid "Footway"
+#~ msgstr "人行步道"
+
+#~ msgid "Edit Track of grade 2"
+#~ msgstr "編輯產業道路等級 2"
+
+#~ msgid "Edit Track of grade 3"
+#~ msgstr "編輯產業道路等級 3"
+
+#~ msgid "Edit Track of grade 1"
+#~ msgstr "編輯產業道路等級 1"
+
+#~ msgid "Track Grade 3"
+#~ msgstr "產業道路等級 3"
+
+#~ msgid "Track Grade 1"
+#~ msgstr "產業道路等級 1"
+
+#~ msgid "Track Grade 2"
+#~ msgstr "產業道路等級 2"
+
+#~ msgid "Edit Track of grade 4"
+#~ msgstr "編輯產業道路等級 4"
+
+#~ msgid "Edit Track of grade 5"
+#~ msgstr "編輯產業道路等級 5"
+
+#~ msgid "Edit Hiking"
+#~ msgstr "編輯健走"
+
+#~ msgid "Track Grade 5"
+#~ msgstr "產業道路等級 5"
+
+#~ msgid "Track Grade 4"
+#~ msgstr "產業道路等級 4"
+
+#~ msgid "Edit Demanding Mountain Hiking"
+#~ msgstr "編輯較難的登山健行"
+
+#~ msgid "Edit Alpine Hiking"
+#~ msgstr "編輯高山健行"
+
+#~ msgid "Edit Mountain Hiking"
+#~ msgstr "編輯登山健行"
+
+#~ msgid "Edit Demanding Alpine Hiking"
+#~ msgstr "編輯較難的高山健行"
+
 #~ msgid "History item"
 #~ msgstr "歷史記錄項目"
@@ -30216,7 +30821,4 @@
 #~ msgstr "下載缺少的外掛程式"
 
-#~ msgid "help"
-#~ msgstr "求助"
-
 #~ msgid "Help / About"
 #~ msgstr "求助 / 關於"
@@ -30225,7 +30827,4 @@
 #~ msgstr "WMS 外掛程式求助"
 
-#~ msgid "Station"
-#~ msgstr "車站"
-
 #~ msgid "Edit Station"
 #~ msgstr "編輯車站"
@@ -30260,4 +30859,7 @@
 #~ msgid "error requesting update: not zoom-level 12"
 #~ msgstr "要求更新發生錯誤：不縮放-等級 12"
+
+#~ msgid "Edit Difficult Alpine Hiking"
+#~ msgstr "編輯艱難的高山健行"
 
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
@@ -30271,10 +30873,25 @@
 #~ "A>建立它。"
 
+#~ msgid "Parameter ''{0}'' must not be null."
+#~ msgstr "參數「{0}」必須不為空值(null)"
+
+#~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
+#~ msgstr "預期為 OsmDataLayer 或 GpxLayer 的實體。卻取得「{0}」。"
+
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "未預期的回傳值。得到 {0}"
 
+#~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
+#~ msgstr "參數「{0}」應為 > 0，得到「{1}」"
+
+#~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
+#~ msgstr "參數「{0}」不是可接受的類別，取得「{1}」"
+
 #~ msgid "There's no version valid at date ''{0}'' in this history."
 #~ msgstr "在這個歷史紀錄日期「{0}」沒有有效的版本"
 
+#~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
+#~ msgstr "參數「{0}」應使用範圍 0..{1}，卻收到 {2}"
+
 #~ msgid "No earliest version found. History is empty."
 #~ msgstr "找不到最早的版本。歷史紀錄是空的。"
@@ -30283,13 +30900,35 @@
 #~ msgstr "找不到最新的版本。歷史紀錄是空的。"
 
+#~ msgid "Parameter current out of range. Got {0}."
+#~ msgstr "參數目前超出範圍：得到 {0}"
+
+#~ msgid "Unexpected column index. Got {0}."
+#~ msgstr "未預期的欄位索引。得到 {0}"
+
+#~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
+#~ msgstr "參數「col」必須為 0 或 1。卻得到 {0}"
+
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "不能讀取 \"{0}\""
 
+#~ msgid "Parameter ''{0}'' must not be null"
+#~ msgstr "參數「{0}」不能為 null"
+
+#~ msgid "Id > 0 required, got {0}"
+#~ msgstr "需要 Id > 0，卻收到 {0}"
+
 #~ msgid "Always move and don't show dialog again"
 #~ msgstr "永遠進行移動而不要顯示這個對話盒"
 
+#~ msgid ""
+#~ "Can''t undo command ''{0}'' because layer ''{1}'' is not present any more"
+#~ msgstr "不能復原「{0}」指令，因為圖層「{1}」已不存在"
+
 #~ msgid "At least one object to delete requird, got empty collection"
 #~ msgstr "至少要刪除一個物件，卻收到空白集合"
 
+#~ msgid "Parameter ''{0}'' must not be empty"
+#~ msgstr "參數「{0}」不能空白"
+
 #~ msgid "null detected in node list"
 #~ msgstr "在節點清單中偵測到 null"
@@ -30297,4 +30936,10 @@
 #~ msgid "unexpected null value for n.getEastNorth(). id of n is"
 #~ msgstr "在 n.getEastNorth() 有未預期的空值(null)。n 的 id 為"
+
+#~ msgid "Parameter ''{0}'' > 0.0 exptected, got {1}"
+#~ msgstr "預期參數「{0}」> 0.0，卻收到 {1}"
+
+#~ msgid "Expected array of length 4, got {0}"
+#~ msgstr "預期的陣列長度為 4，卻收到 {0}"
 
 #~ msgid ""
@@ -30306,6 +30951,12 @@
 #~ msgstr "無法讀取載入資源「{0}」。錯誤為 {1}"
 
+#~ msgid "Expected ID >= 0. Got {0}."
+#~ msgstr "預期 ID >= 0。收到 {0}。"
+
 #~ msgid "User with the same uid but different name found"
 #~ msgstr "發現同一 uid 的使用者但姓名卻不同"
+
+#~ msgid "Parameter ''{0}'' > 0 expected, got {1}"
+#~ msgstr "預期參數「{0}」> 0，卻收到 {1}"
 
 #~ msgid ""
@@ -30318,9 +30969,21 @@
 #~ "      Java 選項來增加分配記憶體的最大容量"
 
+#~ msgid "Parameter ''{0}'' must not be empty."
+#~ msgstr "參數「{0}」不能為空白。"
+
+#~ msgid "Parameter ''{0}'' with tags for exactly one key expected. Got {1}."
+#~ msgstr "標籤的參數「{0}」只能有一個鍵值。卻收到 {1}。"
+
 #~ msgid "Please restart JOSM."
 #~ msgstr "請重新啟動 JOSM。"
 
+#~ msgid "<html>"
+#~ msgstr "<html>"
+
 #~ msgid "Updating primitive"
 #~ msgstr "正在更新原型"
+
+#~ msgid "Dialog not created yet. Invoke createInstance() first"
+#~ msgstr "對話盒尚未建立。先呼叫 createInstance()"
 
 #~ msgid ""
@@ -30340,4 +31003,15 @@
 #~ "<strong>保留</strong> 它們：目標節點將會取代原本成員中節點的位置。</html>"
 
+#~ msgid "Conflicts in data"
+#~ msgstr "衝突發生於資料"
+
+#~ msgid ""
+#~ "<html>You are setting an empty role on {0} primitives.<br>This is equal "
+#~ "to deleting the roles of these primitives.<br>Do you really want to apply "
+#~ "the new role?</html>"
+#~ msgstr ""
+#~ "<html>您正在 {0} 原型上設定空角色。<br>這個動作等於要刪除這些原型的角色。"
+#~ "<br>您確定要套用此新角色嗎？</html>"
+
 #~ msgid "{0} Plugin successfully downloaded."
 #~ msgid_plural "{0} Plugins successfully downloaded."
@@ -30373,2 +31047,8 @@
 #~ "在偏好設定「{0}」中連接埠號碼的格式不正確。得到的數值是「{1}」。將不使用代"
 #~ "理伺服器。"
+
+#~ msgid "Parameter ''{0}'' >= 0 expected, got {1}"
+#~ msgstr "預期參數 ''{0}'' >= 0，卻收到 {1}"
+
+#~ msgid "Value of child.getId() > 0 expected. Got {1}."
+#~ msgstr "預期的數值為 child.getId() > 0。卻得到 {1}。"
